« back to all changes in this revision
Viewing changes to mwl36.patch
- browse files at revision 132.1.2
- compare with another revision
- download diff
- download tarball
- view history from revision 132.1.2
- Committer: Oleg Tsarev
- Date: 2010-11-02 00:36:11 UTC
- mto: This revision was merged to the branch mainline in revision 136.
- Revision ID: oleg.tsarev@percona.com-20101102003611-brz6hb9l2uaqz4fq
adapt source code
added
removed
mwl36.patch
5
5
#!!! notice !!!
6
6
# Any small change to this file in the main branch
7
7
# should be done or reviewed by the maintainer!
8
diff -Nur a/client/client_priv.h b/client/client_priv.h
8
diff -ruN a/client/client_priv.h b/client/client_priv.h
9
9
--- a/client/client_priv.h 2010-08-10 18:53:37.416993880 +0400
10
10
+++ b/client/client_priv.h 2010-08-10 18:54:00.447005246 +0400
11
@@ -93,4 +93,5 @@
11
@@ -92,6 +92,7 @@
12
OPT_WRITE_BINLOG, OPT_DUMP_DATE,
13
OPT_SYSLOG,
12
14
OPT_FIRST_SLAVE,
13
15
+ OPT_REWRITE_DB,
14
16
OPT_ALL,
15
17
OPT_MAX_CLIENT_OPTION
16
18
};
17
diff -Nur a/client/Makefile.am b/client/Makefile.am
19
diff -ruN a/client/Makefile.am b/client/Makefile.am
18
20
--- a/client/Makefile.am 2010-07-09 16:35:11.000000000 +0400
19
21
+++ b/client/Makefile.am 2010-08-10 18:54:00.447005246 +0400
20
22
@@ -24,6 +24,7 @@
35
37
strings_src=decimal.c
36
38
37
39
link_sources:
38
diff -Nur a/client/Makefile.in b/client/Makefile.in
40
diff -ruN a/client/Makefile.in b/client/Makefile.in
39
41
--- a/client/Makefile.in 2010-07-09 16:38:07.000000000 +0400
40
42
+++ b/client/Makefile.in 2010-08-10 18:55:18.966991591 +0400
41
@@ -549,7 +549,8 @@
43
@@ -552,7 +552,8 @@
42
44
rpl_utility.h rpl_tblmap.h rpl_tblmap.cc \
43
45
log_event.cc my_decimal.h my_decimal.cc \
44
46
log_event_old.h log_event_old.cc \
48
50
49
51
strings_src = decimal.c
50
52
all: $(BUILT_SOURCES)
51
diff -Nur a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
53
diff -ruN a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
52
54
--- a/client/mysqlbinlog.cc 2010-08-10 18:53:37.557002220 +0400
53
55
+++ b/client/mysqlbinlog.cc 2010-08-10 18:54:00.447005246 +0400
54
56
@@ -35,6 +35,15 @@
309
311
+#include "sql_list.cc"
310
312
+#include "rpl_filter.cc"
311
313
312
diff -Nur a/client/sql_string.cc b/client/sql_string.cc
314
diff -ruN a/client/sql_string.cc b/client/sql_string.cc
313
315
--- a/client/sql_string.cc 2010-07-09 16:35:16.000000000 +0400
314
316
+++ b/client/sql_string.cc 2010-08-10 18:54:00.447005246 +0400
315
317
@@ -26,15 +26,6 @@
328
330
#include "sql_string.h"
329
331
330
332
/*****************************************************************************
331
diff -Nur a/client/sql_string.h b/client/sql_string.h
333
diff -ruN a/client/sql_string.h b/client/sql_string.h
332
334
--- a/client/sql_string.h 2010-07-09 16:35:16.000000000 +0400
333
335
+++ b/client/sql_string.h 2010-08-10 18:54:00.447005246 +0400
334
336
@@ -15,6 +15,9 @@
347
349
};
348
350
+
349
351
+#endif
350
diff -Nur a/sql/log_event.cc b/sql/log_event.cc
352
diff -ruN a/sql/log_event.cc b/sql/log_event.cc
351
353
--- a/sql/log_event.cc 2010-08-10 18:53:35.676993203 +0400
352
354
+++ b/sql/log_event.cc 2010-08-10 18:54:00.456991993 +0400
353
355
@@ -1122,7 +1122,7 @@
359
361
360
362
err:
361
363
UNLOCK_MUTEX;
362
@@ -8112,6 +8112,111 @@
364
@@ -8186,6 +8186,111 @@
363
365
my_free(m_memory, MYF(MY_ALLOW_ZERO_PTR));
364
366
}
365
367
471
473
/*
472
474
Return value is an error code, one of:
473
475
474
diff -Nur a/sql/log_event.h b/sql/log_event.h
476
diff -ruN a/sql/log_event.h b/sql/log_event.h
475
477
--- a/sql/log_event.h 2010-07-09 16:34:57.000000000 +0400
476
478
+++ b/sql/log_event.h 2010-08-10 18:54:00.456991993 +0400
477
@@ -878,6 +878,13 @@
479
@@ -881,6 +881,13 @@
478
480
event's type, and its content is distributed in the event-specific fields.
479
481
*/
480
482
char *temp_buf;
488
490
/*
489
491
Timestamp on the master(for debugging and replication of
490
492
NOW()/TIMESTAMP). It is important for queries and LOAD DATA
491
@@ -1019,12 +1026,17 @@
493
@@ -1022,12 +1029,17 @@
492
494
Log_event(const char* buf, const Format_description_log_event
493
495
*description_event);
494
496
virtual ~Log_event() { free_temp_buf();}
508
510
temp_buf = 0;
509
511
}
510
512
}
511
@@ -3345,6 +3357,8 @@
513
@@ -3350,6 +3362,8 @@
512
514
ulong get_table_id() const { return m_table_id; }
513
515
const char *get_table_name() const { return m_tblnam; }
514
516
const char *get_db_name() const { return m_dbnam; }
517
519
#endif
518
520
519
521
virtual Log_event_type get_type_code() { return TABLE_MAP_EVENT; }
520
diff -Nur a/sql/mysqld.cc b/sql/mysqld.cc
522
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
521
523
--- a/sql/mysqld.cc 2010-08-10 18:53:37.446991836 +0400
522
524
+++ b/sql/mysqld.cc 2010-08-10 18:54:00.477007672 +0400
523
@@ -8517,6 +8510,7 @@
525
@@ -8524,6 +8524,7 @@
524
526
}
525
527
case (int)OPT_REPLICATE_REWRITE_DB:
526
528
{
528
530
char* key = argument,*p, *val;
529
531
530
532
if (!(p= strstr(argument, "->")))
531
diff -Nur a/sql/mysql_priv.h b/sql/mysql_priv.h
533
diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
532
534
--- a/sql/mysql_priv.h 2010-08-10 18:53:37.446991836 +0400
533
535
+++ b/sql/mysql_priv.h 2010-08-10 18:54:00.477007672 +0400
534
536
@@ -91,12 +91,16 @@
548
550
char *sql_strmake_with_convert(const char *str, size_t arg_length,
549
551
CHARSET_INFO *from_cs,
550
552
size_t max_res_length,
551
diff -Nur a/sql/rpl_filter.cc b/sql/rpl_filter.cc
553
diff -ruN a/sql/rpl_filter.cc b/sql/rpl_filter.cc
552
554
--- a/sql/rpl_filter.cc 2010-07-09 16:35:16.000000000 +0400
553
555
+++ b/sql/rpl_filter.cc 2010-08-10 18:54:00.477007672 +0400
554
556
@@ -45,6 +45,7 @@
581
583
const char*
582
584
Rpl_filter::get_rewrite_db(const char* db, size_t *new_len)
583
585
{
584
diff -Nur a/sql/rpl_filter.h b/sql/rpl_filter.h
586
diff -ruN a/sql/rpl_filter.h b/sql/rpl_filter.h
585
587
--- a/sql/rpl_filter.h 2010-07-09 16:35:16.000000000 +0400
586
588
+++ b/sql/rpl_filter.h 2010-08-10 18:54:00.477007672 +0400
587
589
@@ -42,7 +42,9 @@
603
605
const char* get_rewrite_db(const char* db, size_t *new_len);
604
606
605
607
I_List<i_string>* get_do_db();
606
diff -Nur a/sql/sql_string.cc b/sql/sql_string.cc
608
diff -ruN a/sql/sql_string.cc b/sql/sql_string.cc
607
609
--- a/sql/sql_string.cc 2010-07-09 16:35:16.000000000 +0400
608
610
+++ b/sql/sql_string.cc 2010-08-10 18:54:00.477007672 +0400
609
611
@@ -37,6 +37,9 @@
616
618
/*****************************************************************************
617
619
** String functions
618
620
*****************************************************************************/
619
diff -Nur a/sql/sql_string.h b/sql/sql_string.h
621
diff -ruN a/sql/sql_string.h b/sql/sql_string.h
620
622
--- a/sql/sql_string.h 2010-07-09 16:35:16.000000000 +0400
621
623
+++ b/sql/sql_string.h 2010-08-10 18:54:00.488242902 +0400
622
624
@@ -1,3 +1,5 @@
642
644
}
643
645
+
644
646
+#endif // MYSQL_SQL_STRING_H_INCLUDED
645
diff -Nur a/sql/thr_malloc.cc b/sql/thr_malloc.cc
647
diff -ruN a/sql/thr_malloc.cc b/sql/thr_malloc.cc
646
648
--- a/sql/thr_malloc.cc 2010-07-09 16:34:54.000000000 +0400
647
649
+++ b/sql/thr_malloc.cc 2010-08-10 18:54:00.488242902 +0400
648
650
@@ -63,11 +63,13 @@
Loggerhead is a web-based interface for Breezy
Version: 2.0.1