« back to all changes in this revision
Viewing changes to mysql-test-rnt.diff
- browse files at revision 173
- compare with another revision
- download diff
- download tarball
- view history from revision 173
- Committer: Oleg Tsarev
- Date: 2011-06-15 21:57:04 UTC
- mfrom: (170.1.2 rnt_rebase)
- Revision ID: oleg.tsarev@percona.com-20110615215704-57l80gh5t12m93j5
port to 5.1.57 (merge with lp:percona-server/5.1)
- files added:
- HandlerSocket-Plugin-for-MySQL
- HandlerSocket-Plugin-for-MySQL/client
- HandlerSocket-Plugin-for-MySQL/docs-en
- HandlerSocket-Plugin-for-MySQL/docs-ja
- HandlerSocket-Plugin-for-MySQL/handlersocket
- HandlerSocket-Plugin-for-MySQL/libhsclient
- HandlerSocket-Plugin-for-MySQL/misc
- HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket
- HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/lib
- HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/lib/Net
- HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/lib/Net/HandlerSocket
- HandlerSocket-Plugin-for-MySQL/perl-Net-HandlerSocket/t
- HandlerSocket-Plugin-for-MySQL/regtest
- HandlerSocket-Plugin-for-MySQL/regtest/common
- HandlerSocket-Plugin-for-MySQL/regtest/test_01_lib
- UDF
- UDF/src
- mysql-test/profiling_slow.patch
- mysql-test/slow_extended.patch/percona_slow_extended-slow_query_log_microseconds_timestamp-cl.result
- files removed:
- build/debian/patches/60_percona_support.dpatch
- files modified:
- Makefile
added
removed
mysql-test-rnt.diff
1
1
diff -ruN a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
2
--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2011-06-15 18:45:27.746737177 +0300
3
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2011-06-15 18:45:39.144360199 +0300
2
--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2011-04-12 15:38:55.000000000 +0300
3
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test 2011-06-16 00:55:36.098405410 +0300
4
4
@@ -321,14 +321,19 @@
5
5
# we check that the error code of the "ROLLBACK" event is 0 and not
6
6
# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
25
25
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
26
26
diff -ruN a/mysql-test/extra/rpl_tests/check_type.inc b/mysql-test/extra/rpl_tests/check_type.inc
27
27
--- a/mysql-test/extra/rpl_tests/check_type.inc 1970-01-01 03:00:00.000000000 +0300
28
+++ b/mysql-test/extra/rpl_tests/check_type.inc 2011-06-15 18:45:39.150360000 +0300
28
+++ b/mysql-test/extra/rpl_tests/check_type.inc 2011-06-16 00:55:36.098405410 +0300
29
29
@@ -0,0 +1,52 @@
30
30
+# Helper file to perform one insert of a value into a table with
31
31
+# different types on master and slave. The file will insert the
79
79
+ SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
80
80
+ START SLAVE;
81
81
+}
82
diff -ruN a/mysql-test/extra/rpl_tests/rpl_deadlock.test b/mysql-test/extra/rpl_tests/rpl_deadlock.test
83
--- a/mysql-test/extra/rpl_tests/rpl_deadlock.test 2011-06-15 18:45:27.748737111 +0300
84
+++ b/mysql-test/extra/rpl_tests/rpl_deadlock.test 2011-06-15 18:45:39.147360101 +0300
85
@@ -72,7 +72,7 @@
86
--source include/stop_slave.inc
87
DELETE FROM t2;
88
# Set slave position to the BEGIN log event
89
---replace_result $master_pos_begin MASTER_POS_BEGIN
90
+--replace_result $master_pos_begin <master_pos_begin>
91
eval CHANGE MASTER TO MASTER_LOG_POS=$master_pos_begin;
92
BEGIN;
93
# Hold lock
94
@@ -103,7 +103,7 @@
95
--source include/stop_slave.inc
96
DELETE FROM t2;
97
# Set slave position to the BEGIN log event
98
---replace_result $master_pos_begin MASTER_POS_BEGIN
99
+--replace_result $master_pos_begin <master_pos_begin>
100
eval CHANGE MASTER TO MASTER_LOG_POS=$master_pos_begin;
101
BEGIN;
102
# Hold lock
103
diff -ruN a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
104
--- a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test 2011-06-15 18:45:27.748737111 +0300
105
+++ b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test 2011-06-15 18:45:39.146360134 +0300
106
@@ -486,12 +486,12 @@
107
108
--echo
109
--echo ********************************************
110
---echo *** Expect slave to fail with Error 1535 ***
111
+--echo *** Expect slave to fail with Error 1677 ***
112
--echo ********************************************
113
--echo
114
connection slave;
115
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
116
---let $slave_sql_errno= 1535
117
+# 1677 = ER_BINLOG_ROW_WRONG_TABLE_DEF
118
+--let $slave_sql_errno= 1677
119
--let $slave_skip_counter= 2
120
--let $show_slave_sql_error= 1
121
--source include/wait_for_slave_sql_error_and_skip.inc
122
@@ -542,12 +542,12 @@
123
124
--echo
125
--echo ********************************************
126
---echo *** Expect slave to fail with Error 1535 ***
127
+--echo *** Expect slave to fail with Error 1677 ***
128
--echo ********************************************
129
--echo
130
connection slave;
131
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
132
---let $slave_sql_errno= 1535
133
+# 1677 = ER_BINLOG_ROW_WRONG_TABLE_DEF
134
+--let $slave_sql_errno= 1677
135
--let $slave_skip_counter= 2
136
--let $show_slave_sql_error= 1
137
--source include/wait_for_slave_sql_error_and_skip.inc
138
diff -ruN a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
139
--- a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test 2011-06-15 18:45:27.750737044 +0300
140
+++ b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test 2011-06-15 18:45:39.148360066 +0300
141
@@ -36,6 +36,9 @@
82
diff -ruN a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test
83
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test 2011-04-12 15:38:56.000000000 +0300
84
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_master.test 2011-06-16 00:55:36.099405376 +0300
85
@@ -124,6 +124,7 @@
86
87
--disable_query_log
88
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
89
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
90
call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091");
91
call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054");
92
call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072");
93
@@ -479,12 +480,12 @@
94
95
--echo
96
--echo ********************************************
97
---echo *** Expect slave to fail with Error 1535 ***
98
+--echo *** Expect slave to fail with Error 1677 ***
99
--echo ********************************************
100
--echo
101
connection slave;
102
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
103
---let $slave_sql_errno= 1535
104
+# 1677 = ER_BINLOG_ROW_WRONG_TABLE_DEF
105
+--let $slave_sql_errno= 1677
106
--let $slave_skip_counter= 2
107
--let $show_slave_sql_error= 1
108
--source include/wait_for_slave_sql_error_and_skip.inc
109
@@ -535,12 +536,12 @@
110
111
--echo
112
--echo ********************************************
113
---echo *** Expect slave to fail with Error 1535 ***
114
+--echo *** Expect slave to fail with Error 1677 ***
115
--echo ********************************************
116
--echo
117
connection slave;
118
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
119
---let $slave_sql_errno= 1535
120
+# 1677 = ER_BINLOG_ROW_WRONG_TABLE_DEF
121
+--let $slave_sql_errno= 1677
122
--let $slave_skip_counter= 2
123
--let $show_slave_sql_error= 1
124
--source include/wait_for_slave_sql_error_and_skip.inc
125
diff -ruN a/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test b/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
126
--- a/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test 2011-04-12 15:38:56.000000000 +0300
127
+++ b/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test 2011-06-16 00:55:36.100405341 +0300
128
@@ -13,6 +13,9 @@
129
# should stop the slave. #
130
#################################################
131
132
+--disable_query_log
133
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
134
+--enable_query_log
135
call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
136
137
--echo **** Diff Table Def Start ****
138
@@ -27,6 +30,9 @@
142
139
STOP SLAVE;
143
140
RESET SLAVE;
144
141
148
145
eval CREATE TABLE t1 (a INT, b INT PRIMARY KEY, c CHAR(20),
149
146
d FLOAT DEFAULT '2.00',
150
147
e CHAR(4) DEFAULT 'TEST')
151
@@ -62,6 +65,8 @@
148
@@ -53,6 +59,8 @@
152
149
sync_slave_with_master;
153
150
SELECT * FROM t1 ORDER BY a;
154
151
157
154
--echo *** Drop t1 ***
158
155
connection master;
159
156
DROP TABLE t1;
160
@@ -96,7 +101,7 @@
157
@@ -87,7 +95,7 @@
161
158
--echo *** Start Slave ***
162
159
connection slave;
163
160
START SLAVE;
166
163
--let $show_slave_sql_error= 1
167
164
--source include/wait_for_slave_sql_error.inc
168
165
STOP SLAVE;
169
@@ -145,10 +150,10 @@
166
@@ -136,10 +144,10 @@
170
167
INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
171
168
172
169
--echo ********************************************
179
176
--let $slave_skip_counter= 2
180
177
--let $show_slave_sql_error= 1
181
178
--source include/wait_for_slave_sql_error_and_skip.inc
182
@@ -188,10 +193,10 @@
179
@@ -179,10 +187,10 @@
183
180
(30000.22,4,'QA TESTING');
184
181
185
182
--echo ********************************************
192
189
--let $slave_skip_counter= 2
193
190
--let $show_slave_sql_error= 1
194
191
--source include/wait_for_slave_sql_error_and_skip.inc
195
@@ -231,10 +236,10 @@
192
@@ -222,10 +230,10 @@
196
193
(2,'JOE',300.01,0,'b2b2',1.0000009);
197
194
198
195
--echo ********************************************
205
202
--let $slave_skip_counter= 2
206
203
--let $show_slave_sql_error= 1
207
204
--source include/wait_for_slave_sql_error_and_skip.inc
208
@@ -275,10 +280,10 @@
205
@@ -266,10 +274,10 @@
209
206
(2,'JOE',300.01,0);
210
207
211
208
--echo ********************************************
218
215
--let $show_slave_sql_error= 1
219
216
--source include/wait_for_slave_sql_error.inc
220
217
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
221
@@ -479,10 +484,10 @@
218
@@ -470,10 +478,10 @@
222
219
INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
223
220
224
221
--echo ********************************************
231
228
--let $slave_skip_counter= 2
232
229
--let $show_slave_sql_error= 1
233
230
--source include/wait_for_slave_sql_error_and_skip.inc
234
@@ -501,7 +506,7 @@
231
@@ -492,7 +500,7 @@
235
232
--echo *** Create t11 on slave ***
236
233
STOP SLAVE;
237
234
RESET SLAVE;
240
237
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE=$engine_type;
241
238
242
239
--echo *** Create t11 on Master ***
243
@@ -521,10 +526,10 @@
240
@@ -512,10 +520,10 @@
244
241
INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
245
242
246
243
--echo ********************************************
253
250
--let $slave_skip_counter= 2
254
251
--let $show_slave_sql_error= 1
255
252
--source include/wait_for_slave_sql_error_and_skip.inc
256
@@ -900,10 +905,10 @@
253
@@ -899,10 +907,10 @@
257
254
INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
258
255
259
256
--echo ********************************************
267
264
--let $show_slave_sql_error= 1
268
265
--source include/wait_for_slave_sql_error_and_skip.inc
269
266
diff -ruN a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test
270
--- a/mysql-test/extra/rpl_tests/rpl_log.test 2011-06-15 18:45:27.749737078 +0300
271
+++ b/mysql-test/extra/rpl_tests/rpl_log.test 2011-06-15 18:45:39.147360101 +0300
267
--- a/mysql-test/extra/rpl_tests/rpl_log.test 2011-04-12 15:38:57.000000000 +0300
268
+++ b/mysql-test/extra/rpl_tests/rpl_log.test 2011-06-16 00:55:36.101405307 +0300
272
269
@@ -14,6 +14,7 @@
273
270
reset master;
274
271
reset slave;
278
275
let $VERSION=`select version()`;
279
276
280
277
diff -ruN a/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc b/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
281
--- a/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc 2011-06-15 18:45:27.747737144 +0300
282
+++ b/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc 2011-06-15 18:45:39.145360167 +0300
278
--- a/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc 2011-04-12 15:38:57.000000000 +0300
279
+++ b/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc 2011-06-16 00:55:36.102405273 +0300
283
280
@@ -532,6 +532,16 @@
284
281
{
285
282
eval ROLLBACK TO s1;
299
296
inc $stmt_id;
300
297
diff -ruN a/mysql-test/extra/rpl_tests/rpl_row_annotate.test b/mysql-test/extra/rpl_tests/rpl_row_annotate.test
301
298
--- a/mysql-test/extra/rpl_tests/rpl_row_annotate.test 1970-01-01 03:00:00.000000000 +0300
302
+++ b/mysql-test/extra/rpl_tests/rpl_row_annotate.test 2011-06-15 18:45:39.146360134 +0300
303
@@ -0,0 +1,155 @@
299
+++ b/mysql-test/extra/rpl_tests/rpl_row_annotate.test 2011-06-16 00:55:36.103405238 +0300
300
@@ -0,0 +1,156 @@
304
301
+########################################################################
305
302
+# WL47: Store in binlog text of statements that caused RBR events
306
303
+# new event : ANNOTATE_ROWS_EVENT
355
352
+
356
353
+INSERT INTO t5(b) VALUES ('foo'), ('bar'), ('baz');
357
354
+SET NAMES latin1;
358
+INSERT INTO t5(b) VALUES ('g�s');
355
+INSERT INTO t5(b) VALUES ('gås');
359
356
+SET NAMES utf8;
360
+INSERT INTO t5(b) VALUES ('gås');
357
+INSERT INTO t5(b) VALUES ('gås');
361
358
+SET NAMES latin1;
362
359
+
363
360
+FLUSH LOGS;
456
453
+sync_slave_with_master;
457
454
+--enable_query_log
458
455
+
456
+--source include/rpl_end.inc
459
457
diff -ruN a/mysql-test/extra/rpl_tests/rpl_row_basic.test b/mysql-test/extra/rpl_tests/rpl_row_basic.test
460
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test 2011-06-15 18:45:27.750737044 +0300
461
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test 2011-06-15 18:45:39.149360032 +0300
462
@@ -6,6 +6,7 @@
458
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test 2011-04-12 15:38:58.000000000 +0300
459
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test 2011-06-16 00:55:36.105405170 +0300
460
@@ -6,6 +6,10 @@
463
461
# First we test tables with only an index.
464
462
#
465
463
464
+--disable_query_log
465
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
466
+--enable_query_log
466
467
+connection master;
467
468
eval CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)$extra_index_t1) ENGINE = $type ;
468
469
SELECT * FROM t1;
469
470
sync_slave_with_master;
470
@@ -156,6 +157,12 @@
471
@@ -156,6 +160,12 @@
471
472
# Testing special column types
472
473
#
473
474
480
481
connection master;
481
482
eval CREATE TABLE t4 (C1 CHAR(1) PRIMARY KEY, B1 BIT(1), B2 BIT(1) NOT NULL DEFAULT 0, C2 CHAR(1) NOT NULL DEFAULT 'A') ENGINE = $type ;
482
483
483
@@ -164,6 +171,10 @@
484
@@ -164,6 +174,10 @@
484
485
sync_slave_with_master;
485
486
SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
486
487
491
492
#
492
493
# Testing conflicting operations
493
494
#
494
@@ -347,6 +358,10 @@
495
@@ -347,6 +361,10 @@
495
496
c CHAR(255) CHARACTER SET utf8 NOT NULL,
496
497
j INT NOT NULL) ENGINE = $type ;
497
498
502
503
--echo [expecting slave to replicate correctly]
503
504
connection master;
504
505
INSERT INTO t1 VALUES (1, "", 1);
505
@@ -367,16 +382,9 @@
506
let $diff_table_2=slave:test.t2;
506
@@ -365,18 +383,9 @@
507
let $diff_tables= master:t2, slave:t2;
507
508
source include/diff_tables.inc;
508
509
509
510
---echo [expecting slave to stop]
510
511
-connection master;
511
512
-INSERT INTO t3 VALUES (1, "", 1);
512
513
-INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
513
-
514
514
515
connection slave;
515
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
516
---let $slave_sql_errno= 1535
516
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
517
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
518
call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
519
---let $slave_sql_errno= 1535
517
520
---let $show_slave_sql_error= 1
518
521
---source include/wait_for_slave_sql_error.inc
519
+SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
520
+
521
connection master;
522
RESET MASTER;
523
connection slave;
524
@@ -401,8 +409,8 @@
522
523
--let $rpl_only_running_threads= 1
524
--source include/rpl_reset.inc
525
@@ -396,8 +405,8 @@
525
526
INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
526
527
527
528
connection slave;
528
529
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
529
---let $slave_sql_errno= 1535
530
---let $slave_sql_errno= 1535
530
531
+# 1677 = ER_BINLOG_ROW_WRONG_TABLE_DEF
531
532
+--let $slave_sql_errno= 1677
532
533
--let $show_slave_sql_error= 1
533
534
--source include/wait_for_slave_sql_error.inc
534
connection master;
535
@@ -419,8 +427,8 @@
535
536
@@ -409,8 +418,8 @@
536
537
INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
537
538
538
539
connection slave;
539
540
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
540
---let $slave_sql_errno= 1535
541
---let $slave_sql_errno= 1535
541
542
+# 1677 = ER_BINLOG_ROW_WRONG_TABLE_DEF
542
543
+--let $slave_sql_errno= 1677
543
544
--let $show_slave_sql_error= 1
544
545
--source include/wait_for_slave_sql_error.inc
545
connection master;
546
@@ -594,7 +602,15 @@
546
547
@@ -575,7 +584,15 @@
547
548
548
549
connection master;
549
550
559
560
eval CREATE TABLE t1 (a bit) ENGINE=$type;
560
561
INSERT IGNORE INTO t1 VALUES (NULL);
561
562
INSERT INTO t1 ( a ) VALUES ( 0 );
562
@@ -639,6 +655,10 @@
563
@@ -620,6 +637,10 @@
563
564
564
565
sync_slave_with_master;
565
566
567
568
+ SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
568
569
+}
569
570
+
570
let $diff_table_1=master:test.t1;
571
let $diff_table_2=slave:test.t1;
571
let $diff_tables= master:t1, slave:t1;
572
572
source include/diff_tables.inc;
573
573
574
diff -ruN a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
574
--- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test 2011-06-15 18:45:27.750737044 +0300
575
+++ b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test 2011-06-15 18:45:39.149360032 +0300
576
@@ -148,7 +148,7 @@
575
--- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test 2011-04-12 15:38:58.000000000 +0300
576
+++ b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test 2011-06-16 00:55:36.106405135 +0300
577
@@ -147,9 +147,9 @@
578
connection master;
577
579
INSERT INTO t4 VALUES (4);
578
580
connection slave;
581
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535");
582
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
579
583
--let $slave_skip_counter= 2
580
584
---let $slave_sql_errno= 1535
581
585
+--let $slave_sql_errno= 1677
582
586
--let $show_slave_sql_error= 1
583
587
--source include/wait_for_slave_sql_error_and_skip.inc
584
588
585
@@ -160,7 +160,7 @@
589
@@ -161,7 +161,7 @@
586
590
INSERT INTO t5 VALUES (5,10,25);
587
591
connection slave;
588
592
--let $slave_skip_counter= 2
591
595
--let $show_slave_sql_error= 1
592
596
--source include/wait_for_slave_sql_error_and_skip.inc
593
597
594
@@ -172,7 +172,7 @@
598
@@ -173,7 +173,7 @@
595
599
INSERT INTO t6 VALUES (6,12,36);
596
600
connection slave;
597
601
--let $slave_skip_counter= 2
602
606
603
607
diff -ruN a/mysql-test/extra/rpl_tests/type_conversions.test b/mysql-test/extra/rpl_tests/type_conversions.test
604
608
--- a/mysql-test/extra/rpl_tests/type_conversions.test 1970-01-01 03:00:00.000000000 +0300
605
+++ b/mysql-test/extra/rpl_tests/type_conversions.test 2011-06-15 18:45:39.145360167 +0300
609
+++ b/mysql-test/extra/rpl_tests/type_conversions.test 2011-06-16 00:55:36.107405100 +0300
606
610
@@ -0,0 +1,882 @@
607
611
+# File containing different lossy and non-lossy type conversions.
608
612
+
1483
1487
+
1484
1488
+
1485
1489
+disable_warnings;
1486
+source include/reset_master_and_slave.inc;
1490
+source include/rpl_reset.inc;
1487
1491
+enable_warnings;
1488
1492
+enable_query_log;
1489
1493
diff -ruN a/mysql-test/include/binlog_start_pos.inc b/mysql-test/include/binlog_start_pos.inc
1490
1494
--- a/mysql-test/include/binlog_start_pos.inc 1970-01-01 03:00:00.000000000 +0300
1491
+++ b/mysql-test/include/binlog_start_pos.inc 2011-06-15 18:45:38.735373725 +0300
1495
+++ b/mysql-test/include/binlog_start_pos.inc 2011-06-16 00:55:36.108405066 +0300
1492
1496
@@ -0,0 +1,26 @@
1493
1497
+##############################################################################
1494
1498
+#
1517
1521
+--enable_query_log
1518
1522
+
1519
1523
diff -ruN a/mysql-test/include/show_binlog_events2.inc b/mysql-test/include/show_binlog_events2.inc
1520
--- a/mysql-test/include/show_binlog_events2.inc 2011-06-15 18:45:27.358750010 +0300
1521
+++ b/mysql-test/include/show_binlog_events2.inc 2011-06-15 18:45:38.744373428 +0300
1524
--- a/mysql-test/include/show_binlog_events2.inc 2011-04-12 15:38:44.000000000 +0300
1525
+++ b/mysql-test/include/show_binlog_events2.inc 2011-06-16 00:55:36.109405032 +0300
1522
1526
@@ -1,4 +1,4 @@
1523
1527
---let $binlog_start=106
1524
1528
+--let $binlog_start=240
1526
1530
--replace_column 2 # 5 #
1527
1531
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
1528
1532
diff -ruN a/mysql-test/include/show_binlog_events.inc b/mysql-test/include/show_binlog_events.inc
1529
--- a/mysql-test/include/show_binlog_events.inc 2011-06-15 18:45:27.345750440 +0300
1530
+++ b/mysql-test/include/show_binlog_events.inc 2011-06-15 18:45:38.734373759 +0300
1533
--- a/mysql-test/include/show_binlog_events.inc 2011-04-12 15:38:44.000000000 +0300
1534
+++ b/mysql-test/include/show_binlog_events.inc 2011-06-16 00:55:36.110404998 +0300
1531
1535
@@ -3,7 +3,7 @@
1532
1536
#
1533
1537
# Useage:
1538
1542
# source include/show_binlog_events.inc;
1539
1543
#
1540
1544
diff -ruN a/mysql-test/include/test_fieldsize.inc b/mysql-test/include/test_fieldsize.inc
1541
--- a/mysql-test/include/test_fieldsize.inc 2011-06-15 18:45:27.358750010 +0300
1542
+++ b/mysql-test/include/test_fieldsize.inc 2011-06-15 18:45:38.744373428 +0300
1545
--- a/mysql-test/include/test_fieldsize.inc 2011-04-12 15:38:45.000000000 +0300
1546
+++ b/mysql-test/include/test_fieldsize.inc 2011-06-16 00:55:36.111404963 +0300
1543
1547
@@ -22,7 +22,7 @@
1544
1548
1545
1549
connection slave;
1550
1554
--source include/wait_for_slave_sql_error.inc
1551
1555
1552
1556
diff -ruN a/mysql-test/r/ctype_cp932_binlog_stm.result b/mysql-test/r/ctype_cp932_binlog_stm.result
1553
--- a/mysql-test/r/ctype_cp932_binlog_stm.result 2011-06-15 18:45:27.765736549 +0300
1554
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result 2011-06-15 18:45:39.162359603 +0300
1555
@@ -44,8 +44,6 @@
1557
--- a/mysql-test/r/ctype_cp932_binlog_stm.result 2011-04-12 15:38:09.000000000 +0300
1558
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result 2011-06-16 00:55:36.112404929 +0300
1559
@@ -44,9 +44,6 @@
1556
1560
master-bin.000001 # Query # # use `test`; DROP PROCEDURE bug18293
1557
1561
master-bin.000001 # Query # # use `test`; DROP TABLE t4
1558
1562
End of 5.0 tests
1563
-call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49");
1559
1564
-SHOW BINLOG EVENTS FROM 365;
1560
1565
-ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
1561
1566
Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.
1562
1567
CREATE TABLE t1 (a varchar(16)) character set cp932;
1563
1568
INSERT INTO t1 VALUES (0x8372835E),(0x8352835E);
1564
1569
diff -ruN a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
1565
--- a/mysql-test/r/mysqlbinlog.result 2011-06-15 18:45:27.765736549 +0300
1566
+++ b/mysql-test/r/mysqlbinlog.result 2011-06-15 18:45:39.162359603 +0300
1570
--- a/mysql-test/r/mysqlbinlog.result 2011-04-12 15:38:21.000000000 +0300
1571
+++ b/mysql-test/r/mysqlbinlog.result 2011-06-16 00:55:36.113404895 +0300
1567
1572
@@ -1,15 +1,17 @@
1568
1573
reset master;
1569
1574
+SET @save_binlog_size= @@global.max_binlog_size;
1675
1680
/*!*/;
1676
1681
diff -ruN a/mysql-test/r/percona_fast_alter_column.result b/mysql-test/r/percona_fast_alter_column.result
1677
1682
--- a/mysql-test/r/percona_fast_alter_column.result 1970-01-01 03:00:00.000000000 +0300
1678
+++ b/mysql-test/r/percona_fast_alter_column.result 2011-06-15 18:45:39.211357983 +0300
1683
+++ b/mysql-test/r/percona_fast_alter_column.result 2011-06-16 00:55:36.113404895 +0300
1679
1684
@@ -0,0 +1,47 @@
1680
1685
+CREATE TABLE t1 (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
1681
1686
+c1 VARCHAR(10)
1726
1731
+DROP TABLE t1;
1727
1732
diff -ruN a/mysql-test/r/percona_mysqlbinlog_max_binlog_statement_size.result b/mysql-test/r/percona_mysqlbinlog_max_binlog_statement_size.result
1728
1733
--- a/mysql-test/r/percona_mysqlbinlog_max_binlog_statement_size.result 1970-01-01 03:00:00.000000000 +0300
1729
+++ b/mysql-test/r/percona_mysqlbinlog_max_binlog_statement_size.result 2011-06-15 18:45:39.181358975 +0300
1734
+++ b/mysql-test/r/percona_mysqlbinlog_max_binlog_statement_size.result 2011-06-16 00:55:36.114404860 +0300
1730
1735
@@ -0,0 +1,38 @@
1731
1736
+RESET MASTER;
1732
1737
+DROP TABLE IF EXISTS t1;
1768
1773
+DROP TABLE t1;
1769
1774
diff -ruN a/mysql-test/r/percona_mysqlbinlog_slave_exec_idempotent.result b/mysql-test/r/percona_mysqlbinlog_slave_exec_idempotent.result
1770
1775
--- a/mysql-test/r/percona_mysqlbinlog_slave_exec_idempotent.result 1970-01-01 03:00:00.000000000 +0300
1771
+++ b/mysql-test/r/percona_mysqlbinlog_slave_exec_idempotent.result 2011-06-15 18:45:39.157359767 +0300
1776
+++ b/mysql-test/r/percona_mysqlbinlog_slave_exec_idempotent.result 2011-06-16 00:55:36.114404860 +0300
1772
1777
@@ -0,0 +1,17 @@
1773
1778
+DROP TABLE IF EXISTS t1;
1774
1779
+CREATE TABLE t1(a INT PRIMARY KEY);
1789
1794
+DROP TABLE t1;
1790
1795
diff -ruN a/mysql-test/r/percona_timestamp_no_default.result b/mysql-test/r/percona_timestamp_no_default.result
1791
1796
--- a/mysql-test/r/percona_timestamp_no_default.result 1970-01-01 03:00:00.000000000 +0300
1792
+++ b/mysql-test/r/percona_timestamp_no_default.result 2011-06-15 18:45:39.200358346 +0300
1797
+++ b/mysql-test/r/percona_timestamp_no_default.result 2011-06-16 00:55:36.115404826 +0300
1793
1798
@@ -0,0 +1,113 @@
1794
1799
+CREATE TABLE t1 (
1795
1800
+f1 TIMESTAMP NOT NULL DEFAULT NULL,
1906
1911
+DROP TABLE test;
1907
1912
diff -ruN a/mysql-test/std_data/words3.dat b/mysql-test/std_data/words3.dat
1908
1913
--- a/mysql-test/std_data/words3.dat 1970-01-01 03:00:00.000000000 +0300
1909
+++ b/mysql-test/std_data/words3.dat 2011-06-15 18:45:38.716374353 +0300
1914
+++ b/mysql-test/std_data/words3.dat 2011-06-16 00:55:36.116404792 +0300
1910
1915
@@ -0,0 +1,66 @@
1911
1916
+Aarhus
1912
1917
+Aaron
1974
1979
+Abel
1975
1980
+Abelian
1976
1981
+Abelson
1977
diff -ruN a/mysql-test/suite/binlog/r/binlog_row_annotate.result b/mysql-test/suite/binlog/r/binlog_row_annotate.result
1978
--- a/mysql-test/suite/binlog/r/binlog_row_annotate.result 1970-01-01 03:00:00.000000000 +0300
1979
+++ b/mysql-test/suite/binlog/r/binlog_row_annotate.result 2011-06-15 18:45:38.760372898 +0300
1980
@@ -0,0 +1,1219 @@
1981
+#####################################################################################
1982
+# The following Annotate_rows events should appear below:
1983
+# - INSERT INTO test2.t2 VALUES (1), (2), (3)
1984
+# - INSERT INTO test3.t3 VALUES (1), (2), (3)
1985
+# - DELETE test1.t1, test2.t2 FROM <...>
1986
+# - INSERT INTO test2.t2 VALUES (1), (2), (3)
1987
+# - DELETE xtest1.xt1, test2.t2 FROM <...>
1988
+#####################################################################################
1989
+show binlog events in 'master-bin.000001' from <start_pos>;
1990
+Log_name Pos Event_type Server_id End_log_pos Info
1991
+master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test1
1992
+master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test2
1993
+master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test3
1994
+master-bin.000001 # Query 1 # CREATE DATABASE test1
1995
+master-bin.000001 # Query 1 # CREATE DATABASE test2
1996
+master-bin.000001 # Query 1 # CREATE DATABASE test3
1997
+master-bin.000001 # Query 1 # BEGIN
1998
+master-bin.000001 # Table_map 1 # table_id: # (test1.t1)
1999
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
2000
+master-bin.000001 # Query 1 # COMMIT
2001
+master-bin.000001 # Query 1 # BEGIN
2002
+master-bin.000001 # Annotate_rows 1 # INSERT INTO test2.t2 VALUES (1), (2), (3)
2003
+master-bin.000001 # Table_map 1 # table_id: # (test2.t2)
2004
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
2005
+master-bin.000001 # Query 1 # COMMIT
2006
+master-bin.000001 # Query 1 # BEGIN
2007
+master-bin.000001 # Annotate_rows 1 # INSERT INTO test3.t3 VALUES (1), (2), (3)
2008
+master-bin.000001 # Table_map 1 # table_id: # (test3.t3)
2009
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
2010
+master-bin.000001 # Query 1 # COMMIT
2011
+master-bin.000001 # Query 1 # BEGIN
2012
+master-bin.000001 # Annotate_rows 1 # DELETE test1.t1, test2.t2
2013
+FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
2014
+WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3.a
2015
+master-bin.000001 # Table_map 1 # table_id: # (test1.t1)
2016
+master-bin.000001 # Table_map 1 # table_id: # (test2.t2)
2017
+master-bin.000001 # Delete_rows 1 # table_id: #
2018
+master-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F
2019
+master-bin.000001 # Query 1 # COMMIT
2020
+master-bin.000001 # Query 1 # BEGIN
2021
+master-bin.000001 # Annotate_rows 1 # INSERT INTO test2.v2 VALUES (1), (2), (3)
2022
+master-bin.000001 # Table_map 1 # table_id: # (test2.t2)
2023
+master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
2024
+master-bin.000001 # Query 1 # COMMIT
2025
+master-bin.000001 # Query 1 # BEGIN
2026
+master-bin.000001 # Annotate_rows 1 # DELETE xtest1.xt1, test2.t2
2027
+FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3
2028
+WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3.a
2029
+master-bin.000001 # Table_map 1 # table_id: # (test2.t2)
2030
+master-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F
2031
+master-bin.000001 # Query 1 # COMMIT
2032
+master-bin.000001 # Rotate 1 # master-bin.000002;pos=4
2033
+#
2034
+#####################################################################################
2035
+# mysqlbinlog
2036
+# The following Annotates should appear in this output:
2037
+# - INSERT INTO test2.t2 VALUES (1), (2), (3)
2038
+# - INSERT INTO test3.t3 VALUES (1), (2), (3)
2039
+# - DELETE test1.t1, test2.t2 FROM <...> (with two subsequent Table maps)
2040
+# - INSERT INTO test2.t2 VALUES (1), (2), (3)
2041
+# - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map)
2042
+#####################################################################################
2043
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
2044
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2045
+DELIMITER /*!*/;
2046
+# at #
2047
+#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
2048
+ROLLBACK/*!*/;
2049
+# at #
2050
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2051
+SET TIMESTAMP=1000000000/*!*/;
2052
+SET @@session.pseudo_thread_id=#/*!*/;
2053
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
2054
+SET @@session.sql_mode=0/*!*/;
2055
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
2056
+/*!\C latin1 *//*!*/;
2057
+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
2058
+SET @@session.lc_time_names=0/*!*/;
2059
+SET @@session.collation_database=DEFAULT/*!*/;
2060
+DROP DATABASE IF EXISTS test1
2061
+/*!*/;
2062
+# at #
2063
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2064
+SET TIMESTAMP=1000000000/*!*/;
2065
+DROP DATABASE IF EXISTS test2
2066
+/*!*/;
2067
+# at #
2068
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2069
+SET TIMESTAMP=1000000000/*!*/;
2070
+DROP DATABASE IF EXISTS test3
2071
+/*!*/;
2072
+# at #
2073
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2074
+SET TIMESTAMP=1000000000/*!*/;
2075
+CREATE DATABASE test1
2076
+/*!*/;
2077
+# at #
2078
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2079
+SET TIMESTAMP=1000000000/*!*/;
2080
+CREATE DATABASE test2
2081
+/*!*/;
2082
+# at #
2083
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2084
+SET TIMESTAMP=1000000000/*!*/;
2085
+CREATE DATABASE test3
2086
+/*!*/;
2087
+# at #
2088
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2089
+SET TIMESTAMP=1000000000/*!*/;
2090
+BEGIN
2091
+/*!*/;
2092
+# at #
2093
+# at #
2094
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2095
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2096
+### INSERT INTO test1.t1
2097
+### SET
2098
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2099
+### INSERT INTO test1.t1
2100
+### SET
2101
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2102
+### INSERT INTO test1.t1
2103
+### SET
2104
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2105
+# at #
2106
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2107
+SET TIMESTAMP=1000000000/*!*/;
2108
+COMMIT
2109
+/*!*/;
2110
+# at #
2111
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2112
+SET TIMESTAMP=1000000000/*!*/;
2113
+BEGIN
2114
+/*!*/;
2115
+# at #
2116
+# at #
2117
+# at #
2118
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2119
+#Q> INSERT INTO test2.t2 VALUES (1), (2), (3)
2120
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2121
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2122
+### INSERT INTO test2.t2
2123
+### SET
2124
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2125
+### INSERT INTO test2.t2
2126
+### SET
2127
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2128
+### INSERT INTO test2.t2
2129
+### SET
2130
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2131
+# at #
2132
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2133
+SET TIMESTAMP=1000000000/*!*/;
2134
+COMMIT
2135
+/*!*/;
2136
+# at #
2137
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2138
+SET TIMESTAMP=1000000000/*!*/;
2139
+BEGIN
2140
+/*!*/;
2141
+# at #
2142
+# at #
2143
+# at #
2144
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2145
+#Q> INSERT INTO test3.t3 VALUES (1), (2), (3)
2146
+#010909 4:46:40 server id # end_log_pos # Table_map: `test3`.`t3` mapped to number #
2147
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2148
+### INSERT INTO test3.t3
2149
+### SET
2150
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2151
+### INSERT INTO test3.t3
2152
+### SET
2153
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2154
+### INSERT INTO test3.t3
2155
+### SET
2156
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2157
+# at #
2158
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2159
+SET TIMESTAMP=1000000000/*!*/;
2160
+COMMIT
2161
+/*!*/;
2162
+# at #
2163
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2164
+SET TIMESTAMP=1000000000/*!*/;
2165
+BEGIN
2166
+/*!*/;
2167
+# at #
2168
+# at #
2169
+# at #
2170
+# at #
2171
+# at #
2172
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2173
+#Q> DELETE test1.t1, test2.t2
2174
+#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
2175
+#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3
2176
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2177
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2178
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id #
2179
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F
2180
+### DELETE FROM test1.t1
2181
+### WHERE
2182
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2183
+### DELETE FROM test1.t1
2184
+### WHERE
2185
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2186
+### DELETE FROM test1.t1
2187
+### WHERE
2188
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2189
+### DELETE FROM test2.t2
2190
+### WHERE
2191
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2192
+### DELETE FROM test2.t2
2193
+### WHERE
2194
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2195
+### DELETE FROM test2.t2
2196
+### WHERE
2197
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2198
+# at #
2199
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2200
+SET TIMESTAMP=1000000000/*!*/;
2201
+COMMIT
2202
+/*!*/;
2203
+# at #
2204
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2205
+SET TIMESTAMP=1000000000/*!*/;
2206
+BEGIN
2207
+/*!*/;
2208
+# at #
2209
+# at #
2210
+# at #
2211
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2212
+#Q> INSERT INTO test2.v2 VALUES (1), (2), (3)
2213
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2214
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2215
+### INSERT INTO test2.t2
2216
+### SET
2217
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2218
+### INSERT INTO test2.t2
2219
+### SET
2220
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2221
+### INSERT INTO test2.t2
2222
+### SET
2223
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2224
+# at #
2225
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2226
+SET TIMESTAMP=1000000000/*!*/;
2227
+COMMIT
2228
+/*!*/;
2229
+# at #
2230
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2231
+SET TIMESTAMP=1000000000/*!*/;
2232
+BEGIN
2233
+/*!*/;
2234
+# at #
2235
+# at #
2236
+# at #
2237
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2238
+#Q> DELETE xtest1.xt1, test2.t2
2239
+#Q> FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3
2240
+#Q> WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3
2241
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2242
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F
2243
+### DELETE FROM test2.t2
2244
+### WHERE
2245
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2246
+### DELETE FROM test2.t2
2247
+### WHERE
2248
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2249
+### DELETE FROM test2.t2
2250
+### WHERE
2251
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2252
+# at #
2253
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2254
+SET TIMESTAMP=1000000000/*!*/;
2255
+COMMIT
2256
+/*!*/;
2257
+# at #
2258
+#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4
2259
+DELIMITER ;
2260
+# End of log file
2261
+ROLLBACK /* added by mysqlbinlog */;
2262
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2263
+#
2264
+#####################################################################################
2265
+# mysqlbinlog --database=test1
2266
+# The following Annotate should appear in this output:
2267
+# - DELETE test1.t1, test2.t2 FROM <...>
2268
+#####################################################################################
2269
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
2270
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2271
+DELIMITER /*!*/;
2272
+# at #
2273
+#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
2274
+ROLLBACK/*!*/;
2275
+# at #
2276
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2277
+SET TIMESTAMP=1000000000/*!*/;
2278
+SET @@session.pseudo_thread_id=#/*!*/;
2279
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
2280
+SET @@session.sql_mode=0/*!*/;
2281
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
2282
+/*!\C latin1 *//*!*/;
2283
+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
2284
+SET @@session.lc_time_names=0/*!*/;
2285
+SET @@session.collation_database=DEFAULT/*!*/;
2286
+DROP DATABASE IF EXISTS test1
2287
+/*!*/;
2288
+# at #
2289
+# at #
2290
+# at #
2291
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2292
+SET TIMESTAMP=1000000000/*!*/;
2293
+CREATE DATABASE test1
2294
+/*!*/;
2295
+# at #
2296
+# at #
2297
+# at #
2298
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2299
+SET TIMESTAMP=1000000000/*!*/;
2300
+BEGIN
2301
+/*!*/;
2302
+# at #
2303
+# at #
2304
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2305
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2306
+### INSERT INTO test1.t1
2307
+### SET
2308
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2309
+### INSERT INTO test1.t1
2310
+### SET
2311
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2312
+### INSERT INTO test1.t1
2313
+### SET
2314
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2315
+# at #
2316
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2317
+SET TIMESTAMP=1000000000/*!*/;
2318
+COMMIT
2319
+/*!*/;
2320
+# at #
2321
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2322
+SET TIMESTAMP=1000000000/*!*/;
2323
+BEGIN
2324
+/*!*/;
2325
+# at #
2326
+# at #
2327
+# at #
2328
+# at #
2329
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2330
+SET TIMESTAMP=1000000000/*!*/;
2331
+COMMIT
2332
+/*!*/;
2333
+# at #
2334
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2335
+SET TIMESTAMP=1000000000/*!*/;
2336
+BEGIN
2337
+/*!*/;
2338
+# at #
2339
+# at #
2340
+# at #
2341
+# at #
2342
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2343
+SET TIMESTAMP=1000000000/*!*/;
2344
+COMMIT
2345
+/*!*/;
2346
+# at #
2347
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2348
+SET TIMESTAMP=1000000000/*!*/;
2349
+BEGIN
2350
+/*!*/;
2351
+# at #
2352
+# at #
2353
+# at #
2354
+# at #
2355
+# at #
2356
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2357
+#Q> DELETE test1.t1, test2.t2
2358
+#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
2359
+#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3
2360
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2361
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id #
2362
+### DELETE FROM test1.t1
2363
+### WHERE
2364
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2365
+### DELETE FROM test1.t1
2366
+### WHERE
2367
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2368
+### DELETE FROM test1.t1
2369
+### WHERE
2370
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2371
+# at #
2372
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2373
+SET TIMESTAMP=1000000000/*!*/;
2374
+COMMIT
2375
+/*!*/;
2376
+# at #
2377
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2378
+SET TIMESTAMP=1000000000/*!*/;
2379
+BEGIN
2380
+/*!*/;
2381
+# at #
2382
+# at #
2383
+# at #
2384
+# at #
2385
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2386
+SET TIMESTAMP=1000000000/*!*/;
2387
+COMMIT
2388
+/*!*/;
2389
+# at #
2390
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2391
+SET TIMESTAMP=1000000000/*!*/;
2392
+BEGIN
2393
+/*!*/;
2394
+# at #
2395
+# at #
2396
+# at #
2397
+# at #
2398
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2399
+SET TIMESTAMP=1000000000/*!*/;
2400
+COMMIT
2401
+/*!*/;
2402
+# at #
2403
+#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4
2404
+DELIMITER ;
2405
+# End of log file
2406
+ROLLBACK /* added by mysqlbinlog */;
2407
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2408
+#
2409
+#####################################################################################
2410
+# mysqlbinlog --skip-annotate-rows-events
2411
+# No Annotates should appear in this output
2412
+#####################################################################################
2413
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
2414
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2415
+DELIMITER /*!*/;
2416
+# at #
2417
+#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
2418
+ROLLBACK/*!*/;
2419
+# at #
2420
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2421
+SET TIMESTAMP=1000000000/*!*/;
2422
+SET @@session.pseudo_thread_id=#/*!*/;
2423
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
2424
+SET @@session.sql_mode=0/*!*/;
2425
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
2426
+/*!\C latin1 *//*!*/;
2427
+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
2428
+SET @@session.lc_time_names=0/*!*/;
2429
+SET @@session.collation_database=DEFAULT/*!*/;
2430
+DROP DATABASE IF EXISTS test1
2431
+/*!*/;
2432
+# at #
2433
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2434
+SET TIMESTAMP=1000000000/*!*/;
2435
+DROP DATABASE IF EXISTS test2
2436
+/*!*/;
2437
+# at #
2438
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2439
+SET TIMESTAMP=1000000000/*!*/;
2440
+DROP DATABASE IF EXISTS test3
2441
+/*!*/;
2442
+# at #
2443
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2444
+SET TIMESTAMP=1000000000/*!*/;
2445
+CREATE DATABASE test1
2446
+/*!*/;
2447
+# at #
2448
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2449
+SET TIMESTAMP=1000000000/*!*/;
2450
+CREATE DATABASE test2
2451
+/*!*/;
2452
+# at #
2453
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2454
+SET TIMESTAMP=1000000000/*!*/;
2455
+CREATE DATABASE test3
2456
+/*!*/;
2457
+# at #
2458
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2459
+SET TIMESTAMP=1000000000/*!*/;
2460
+BEGIN
2461
+/*!*/;
2462
+# at #
2463
+# at #
2464
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2465
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2466
+### INSERT INTO test1.t1
2467
+### SET
2468
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2469
+### INSERT INTO test1.t1
2470
+### SET
2471
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2472
+### INSERT INTO test1.t1
2473
+### SET
2474
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2475
+# at #
2476
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2477
+SET TIMESTAMP=1000000000/*!*/;
2478
+COMMIT
2479
+/*!*/;
2480
+# at #
2481
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2482
+SET TIMESTAMP=1000000000/*!*/;
2483
+BEGIN
2484
+/*!*/;
2485
+# at #
2486
+# at #
2487
+# at #
2488
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2489
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2490
+### INSERT INTO test2.t2
2491
+### SET
2492
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2493
+### INSERT INTO test2.t2
2494
+### SET
2495
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2496
+### INSERT INTO test2.t2
2497
+### SET
2498
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2499
+# at #
2500
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2501
+SET TIMESTAMP=1000000000/*!*/;
2502
+COMMIT
2503
+/*!*/;
2504
+# at #
2505
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2506
+SET TIMESTAMP=1000000000/*!*/;
2507
+BEGIN
2508
+/*!*/;
2509
+# at #
2510
+# at #
2511
+# at #
2512
+#010909 4:46:40 server id # end_log_pos # Table_map: `test3`.`t3` mapped to number #
2513
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2514
+### INSERT INTO test3.t3
2515
+### SET
2516
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2517
+### INSERT INTO test3.t3
2518
+### SET
2519
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2520
+### INSERT INTO test3.t3
2521
+### SET
2522
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2523
+# at #
2524
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2525
+SET TIMESTAMP=1000000000/*!*/;
2526
+COMMIT
2527
+/*!*/;
2528
+# at #
2529
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2530
+SET TIMESTAMP=1000000000/*!*/;
2531
+BEGIN
2532
+/*!*/;
2533
+# at #
2534
+# at #
2535
+# at #
2536
+# at #
2537
+# at #
2538
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2539
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2540
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id #
2541
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F
2542
+### DELETE FROM test1.t1
2543
+### WHERE
2544
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2545
+### DELETE FROM test1.t1
2546
+### WHERE
2547
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2548
+### DELETE FROM test1.t1
2549
+### WHERE
2550
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2551
+### DELETE FROM test2.t2
2552
+### WHERE
2553
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2554
+### DELETE FROM test2.t2
2555
+### WHERE
2556
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2557
+### DELETE FROM test2.t2
2558
+### WHERE
2559
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2560
+# at #
2561
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2562
+SET TIMESTAMP=1000000000/*!*/;
2563
+COMMIT
2564
+/*!*/;
2565
+# at #
2566
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2567
+SET TIMESTAMP=1000000000/*!*/;
2568
+BEGIN
2569
+/*!*/;
2570
+# at #
2571
+# at #
2572
+# at #
2573
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2574
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2575
+### INSERT INTO test2.t2
2576
+### SET
2577
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2578
+### INSERT INTO test2.t2
2579
+### SET
2580
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2581
+### INSERT INTO test2.t2
2582
+### SET
2583
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2584
+# at #
2585
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2586
+SET TIMESTAMP=1000000000/*!*/;
2587
+COMMIT
2588
+/*!*/;
2589
+# at #
2590
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2591
+SET TIMESTAMP=1000000000/*!*/;
2592
+BEGIN
2593
+/*!*/;
2594
+# at #
2595
+# at #
2596
+# at #
2597
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2598
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F
2599
+### DELETE FROM test2.t2
2600
+### WHERE
2601
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2602
+### DELETE FROM test2.t2
2603
+### WHERE
2604
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2605
+### DELETE FROM test2.t2
2606
+### WHERE
2607
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2608
+# at #
2609
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2610
+SET TIMESTAMP=1000000000/*!*/;
2611
+COMMIT
2612
+/*!*/;
2613
+# at #
2614
+#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4
2615
+DELIMITER ;
2616
+# End of log file
2617
+ROLLBACK /* added by mysqlbinlog */;
2618
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2619
+#
2620
+#####################################################################################
2621
+# mysqlbinlog --read-from-remote-server
2622
+# The following Annotates should appear in this output:
2623
+# - INSERT INTO test2.t2 VALUES (1), (2), (3)
2624
+# - INSERT INTO test3.t3 VALUES (1), (2), (3)
2625
+# - DELETE test1.t1, test2.t2 FROM <...> (with two subsequent Table maps)
2626
+# - INSERT INTO test2.t2 VALUES (1), (2), (3)
2627
+# - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map)
2628
+#####################################################################################
2629
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
2630
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2631
+DELIMITER /*!*/;
2632
+# at #
2633
+#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
2634
+ROLLBACK/*!*/;
2635
+# at #
2636
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2637
+SET TIMESTAMP=1000000000/*!*/;
2638
+SET @@session.pseudo_thread_id=#/*!*/;
2639
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
2640
+SET @@session.sql_mode=0/*!*/;
2641
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
2642
+/*!\C latin1 *//*!*/;
2643
+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
2644
+SET @@session.lc_time_names=0/*!*/;
2645
+SET @@session.collation_database=DEFAULT/*!*/;
2646
+DROP DATABASE IF EXISTS test1
2647
+/*!*/;
2648
+# at #
2649
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2650
+SET TIMESTAMP=1000000000/*!*/;
2651
+DROP DATABASE IF EXISTS test2
2652
+/*!*/;
2653
+# at #
2654
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2655
+SET TIMESTAMP=1000000000/*!*/;
2656
+DROP DATABASE IF EXISTS test3
2657
+/*!*/;
2658
+# at #
2659
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2660
+SET TIMESTAMP=1000000000/*!*/;
2661
+CREATE DATABASE test1
2662
+/*!*/;
2663
+# at #
2664
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2665
+SET TIMESTAMP=1000000000/*!*/;
2666
+CREATE DATABASE test2
2667
+/*!*/;
2668
+# at #
2669
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2670
+SET TIMESTAMP=1000000000/*!*/;
2671
+CREATE DATABASE test3
2672
+/*!*/;
2673
+# at #
2674
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2675
+SET TIMESTAMP=1000000000/*!*/;
2676
+BEGIN
2677
+/*!*/;
2678
+# at #
2679
+# at #
2680
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2681
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2682
+### INSERT INTO test1.t1
2683
+### SET
2684
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2685
+### INSERT INTO test1.t1
2686
+### SET
2687
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2688
+### INSERT INTO test1.t1
2689
+### SET
2690
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2691
+# at #
2692
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2693
+SET TIMESTAMP=1000000000/*!*/;
2694
+COMMIT
2695
+/*!*/;
2696
+# at #
2697
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2698
+SET TIMESTAMP=1000000000/*!*/;
2699
+BEGIN
2700
+/*!*/;
2701
+# at #
2702
+# at #
2703
+# at #
2704
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2705
+#Q> INSERT INTO test2.t2 VALUES (1), (2), (3)
2706
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2707
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2708
+### INSERT INTO test2.t2
2709
+### SET
2710
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2711
+### INSERT INTO test2.t2
2712
+### SET
2713
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2714
+### INSERT INTO test2.t2
2715
+### SET
2716
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2717
+# at #
2718
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2719
+SET TIMESTAMP=1000000000/*!*/;
2720
+COMMIT
2721
+/*!*/;
2722
+# at #
2723
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2724
+SET TIMESTAMP=1000000000/*!*/;
2725
+BEGIN
2726
+/*!*/;
2727
+# at #
2728
+# at #
2729
+# at #
2730
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2731
+#Q> INSERT INTO test3.t3 VALUES (1), (2), (3)
2732
+#010909 4:46:40 server id # end_log_pos # Table_map: `test3`.`t3` mapped to number #
2733
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2734
+### INSERT INTO test3.t3
2735
+### SET
2736
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2737
+### INSERT INTO test3.t3
2738
+### SET
2739
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2740
+### INSERT INTO test3.t3
2741
+### SET
2742
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2743
+# at #
2744
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2745
+SET TIMESTAMP=1000000000/*!*/;
2746
+COMMIT
2747
+/*!*/;
2748
+# at #
2749
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2750
+SET TIMESTAMP=1000000000/*!*/;
2751
+BEGIN
2752
+/*!*/;
2753
+# at #
2754
+# at #
2755
+# at #
2756
+# at #
2757
+# at #
2758
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2759
+#Q> DELETE test1.t1, test2.t2
2760
+#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
2761
+#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3
2762
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2763
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2764
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id #
2765
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F
2766
+### DELETE FROM test1.t1
2767
+### WHERE
2768
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2769
+### DELETE FROM test1.t1
2770
+### WHERE
2771
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2772
+### DELETE FROM test1.t1
2773
+### WHERE
2774
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2775
+### DELETE FROM test2.t2
2776
+### WHERE
2777
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2778
+### DELETE FROM test2.t2
2779
+### WHERE
2780
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2781
+### DELETE FROM test2.t2
2782
+### WHERE
2783
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2784
+# at #
2785
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2786
+SET TIMESTAMP=1000000000/*!*/;
2787
+COMMIT
2788
+/*!*/;
2789
+# at #
2790
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2791
+SET TIMESTAMP=1000000000/*!*/;
2792
+BEGIN
2793
+/*!*/;
2794
+# at #
2795
+# at #
2796
+# at #
2797
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2798
+#Q> INSERT INTO test2.v2 VALUES (1), (2), (3)
2799
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2800
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2801
+### INSERT INTO test2.t2
2802
+### SET
2803
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2804
+### INSERT INTO test2.t2
2805
+### SET
2806
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2807
+### INSERT INTO test2.t2
2808
+### SET
2809
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2810
+# at #
2811
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2812
+SET TIMESTAMP=1000000000/*!*/;
2813
+COMMIT
2814
+/*!*/;
2815
+# at #
2816
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2817
+SET TIMESTAMP=1000000000/*!*/;
2818
+BEGIN
2819
+/*!*/;
2820
+# at #
2821
+# at #
2822
+# at #
2823
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2824
+#Q> DELETE xtest1.xt1, test2.t2
2825
+#Q> FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3
2826
+#Q> WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3
2827
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
2828
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F
2829
+### DELETE FROM test2.t2
2830
+### WHERE
2831
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2832
+### DELETE FROM test2.t2
2833
+### WHERE
2834
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2835
+### DELETE FROM test2.t2
2836
+### WHERE
2837
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2838
+# at #
2839
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2840
+SET TIMESTAMP=1000000000/*!*/;
2841
+COMMIT
2842
+/*!*/;
2843
+# at #
2844
+#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4
2845
+DELIMITER ;
2846
+# End of log file
2847
+ROLLBACK /* added by mysqlbinlog */;
2848
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2849
+#
2850
+#####################################################################################
2851
+# mysqlbinlog --read-from-remote-server --database=test1
2852
+# The following Annotate should appear in this output:
2853
+# - DELETE test1.t1, test2.t2 FROM <...>
2854
+#####################################################################################
2855
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
2856
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2857
+DELIMITER /*!*/;
2858
+# at #
2859
+#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
2860
+ROLLBACK/*!*/;
2861
+# at #
2862
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2863
+SET TIMESTAMP=1000000000/*!*/;
2864
+SET @@session.pseudo_thread_id=#/*!*/;
2865
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
2866
+SET @@session.sql_mode=0/*!*/;
2867
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
2868
+/*!\C latin1 *//*!*/;
2869
+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
2870
+SET @@session.lc_time_names=0/*!*/;
2871
+SET @@session.collation_database=DEFAULT/*!*/;
2872
+DROP DATABASE IF EXISTS test1
2873
+/*!*/;
2874
+# at #
2875
+# at #
2876
+# at #
2877
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2878
+SET TIMESTAMP=1000000000/*!*/;
2879
+CREATE DATABASE test1
2880
+/*!*/;
2881
+# at #
2882
+# at #
2883
+# at #
2884
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2885
+SET TIMESTAMP=1000000000/*!*/;
2886
+BEGIN
2887
+/*!*/;
2888
+# at #
2889
+# at #
2890
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2891
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
2892
+### INSERT INTO test1.t1
2893
+### SET
2894
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2895
+### INSERT INTO test1.t1
2896
+### SET
2897
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2898
+### INSERT INTO test1.t1
2899
+### SET
2900
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2901
+# at #
2902
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2903
+SET TIMESTAMP=1000000000/*!*/;
2904
+COMMIT
2905
+/*!*/;
2906
+# at #
2907
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2908
+SET TIMESTAMP=1000000000/*!*/;
2909
+BEGIN
2910
+/*!*/;
2911
+# at #
2912
+# at #
2913
+# at #
2914
+# at #
2915
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2916
+SET TIMESTAMP=1000000000/*!*/;
2917
+COMMIT
2918
+/*!*/;
2919
+# at #
2920
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2921
+SET TIMESTAMP=1000000000/*!*/;
2922
+BEGIN
2923
+/*!*/;
2924
+# at #
2925
+# at #
2926
+# at #
2927
+# at #
2928
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2929
+SET TIMESTAMP=1000000000/*!*/;
2930
+COMMIT
2931
+/*!*/;
2932
+# at #
2933
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2934
+SET TIMESTAMP=1000000000/*!*/;
2935
+BEGIN
2936
+/*!*/;
2937
+# at #
2938
+# at #
2939
+# at #
2940
+# at #
2941
+# at #
2942
+#010909 4:46:40 server id # end_log_pos # Annotate_rows:
2943
+#Q> DELETE test1.t1, test2.t2
2944
+#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3
2945
+#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3
2946
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
2947
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id #
2948
+### DELETE FROM test1.t1
2949
+### WHERE
2950
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
2951
+### DELETE FROM test1.t1
2952
+### WHERE
2953
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
2954
+### DELETE FROM test1.t1
2955
+### WHERE
2956
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
2957
+# at #
2958
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2959
+SET TIMESTAMP=1000000000/*!*/;
2960
+COMMIT
2961
+/*!*/;
2962
+# at #
2963
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2964
+SET TIMESTAMP=1000000000/*!*/;
2965
+BEGIN
2966
+/*!*/;
2967
+# at #
2968
+# at #
2969
+# at #
2970
+# at #
2971
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2972
+SET TIMESTAMP=1000000000/*!*/;
2973
+COMMIT
2974
+/*!*/;
2975
+# at #
2976
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2977
+SET TIMESTAMP=1000000000/*!*/;
2978
+BEGIN
2979
+/*!*/;
2980
+# at #
2981
+# at #
2982
+# at #
2983
+# at #
2984
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
2985
+SET TIMESTAMP=1000000000/*!*/;
2986
+COMMIT
2987
+/*!*/;
2988
+# at #
2989
+#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4
2990
+DELIMITER ;
2991
+# End of log file
2992
+ROLLBACK /* added by mysqlbinlog */;
2993
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
2994
+#
2995
+#####################################################################################
2996
+# mysqlbinlog --read-from-remote-server --skip-annotate-rows-events
2997
+# No Annotates should appear in this output
2998
+#####################################################################################
2999
+/*!40019 SET @@session.max_insert_delayed_threads=0*/;
3000
+/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
3001
+DELIMITER /*!*/;
3002
+# at #
3003
+#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup
3004
+ROLLBACK/*!*/;
3005
+# at #
3006
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3007
+SET TIMESTAMP=1000000000/*!*/;
3008
+SET @@session.pseudo_thread_id=#/*!*/;
3009
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
3010
+SET @@session.sql_mode=0/*!*/;
3011
+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
3012
+/*!\C latin1 *//*!*/;
3013
+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
3014
+SET @@session.lc_time_names=0/*!*/;
3015
+SET @@session.collation_database=DEFAULT/*!*/;
3016
+DROP DATABASE IF EXISTS test1
3017
+/*!*/;
3018
+# at #
3019
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3020
+SET TIMESTAMP=1000000000/*!*/;
3021
+DROP DATABASE IF EXISTS test2
3022
+/*!*/;
3023
+# at #
3024
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3025
+SET TIMESTAMP=1000000000/*!*/;
3026
+DROP DATABASE IF EXISTS test3
3027
+/*!*/;
3028
+# at #
3029
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3030
+SET TIMESTAMP=1000000000/*!*/;
3031
+CREATE DATABASE test1
3032
+/*!*/;
3033
+# at #
3034
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3035
+SET TIMESTAMP=1000000000/*!*/;
3036
+CREATE DATABASE test2
3037
+/*!*/;
3038
+# at #
3039
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3040
+SET TIMESTAMP=1000000000/*!*/;
3041
+CREATE DATABASE test3
3042
+/*!*/;
3043
+# at #
3044
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3045
+SET TIMESTAMP=1000000000/*!*/;
3046
+BEGIN
3047
+/*!*/;
3048
+# at #
3049
+# at #
3050
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
3051
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
3052
+### INSERT INTO test1.t1
3053
+### SET
3054
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
3055
+### INSERT INTO test1.t1
3056
+### SET
3057
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
3058
+### INSERT INTO test1.t1
3059
+### SET
3060
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
3061
+# at #
3062
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3063
+SET TIMESTAMP=1000000000/*!*/;
3064
+COMMIT
3065
+/*!*/;
3066
+# at #
3067
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3068
+SET TIMESTAMP=1000000000/*!*/;
3069
+BEGIN
3070
+/*!*/;
3071
+# at #
3072
+# at #
3073
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
3074
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
3075
+### INSERT INTO test2.t2
3076
+### SET
3077
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
3078
+### INSERT INTO test2.t2
3079
+### SET
3080
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
3081
+### INSERT INTO test2.t2
3082
+### SET
3083
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
3084
+# at #
3085
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3086
+SET TIMESTAMP=1000000000/*!*/;
3087
+COMMIT
3088
+/*!*/;
3089
+# at #
3090
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3091
+SET TIMESTAMP=1000000000/*!*/;
3092
+BEGIN
3093
+/*!*/;
3094
+# at #
3095
+# at #
3096
+#010909 4:46:40 server id # end_log_pos # Table_map: `test3`.`t3` mapped to number #
3097
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
3098
+### INSERT INTO test3.t3
3099
+### SET
3100
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
3101
+### INSERT INTO test3.t3
3102
+### SET
3103
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
3104
+### INSERT INTO test3.t3
3105
+### SET
3106
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
3107
+# at #
3108
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3109
+SET TIMESTAMP=1000000000/*!*/;
3110
+COMMIT
3111
+/*!*/;
3112
+# at #
3113
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3114
+SET TIMESTAMP=1000000000/*!*/;
3115
+BEGIN
3116
+/*!*/;
3117
+# at #
3118
+# at #
3119
+# at #
3120
+# at #
3121
+#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number #
3122
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
3123
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id #
3124
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F
3125
+### DELETE FROM test1.t1
3126
+### WHERE
3127
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
3128
+### DELETE FROM test1.t1
3129
+### WHERE
3130
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
3131
+### DELETE FROM test1.t1
3132
+### WHERE
3133
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
3134
+### DELETE FROM test2.t2
3135
+### WHERE
3136
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
3137
+### DELETE FROM test2.t2
3138
+### WHERE
3139
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
3140
+### DELETE FROM test2.t2
3141
+### WHERE
3142
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
3143
+# at #
3144
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3145
+SET TIMESTAMP=1000000000/*!*/;
3146
+COMMIT
3147
+/*!*/;
3148
+# at #
3149
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3150
+SET TIMESTAMP=1000000000/*!*/;
3151
+BEGIN
3152
+/*!*/;
3153
+# at #
3154
+# at #
3155
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
3156
+#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F
3157
+### INSERT INTO test2.t2
3158
+### SET
3159
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
3160
+### INSERT INTO test2.t2
3161
+### SET
3162
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
3163
+### INSERT INTO test2.t2
3164
+### SET
3165
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
3166
+# at #
3167
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3168
+SET TIMESTAMP=1000000000/*!*/;
3169
+COMMIT
3170
+/*!*/;
3171
+# at #
3172
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3173
+SET TIMESTAMP=1000000000/*!*/;
3174
+BEGIN
3175
+/*!*/;
3176
+# at #
3177
+# at #
3178
+#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number #
3179
+#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F
3180
+### DELETE FROM test2.t2
3181
+### WHERE
3182
+### @1=3 /* INT meta=0 nullable=1 is_null=0 */
3183
+### DELETE FROM test2.t2
3184
+### WHERE
3185
+### @1=2 /* INT meta=0 nullable=1 is_null=0 */
3186
+### DELETE FROM test2.t2
3187
+### WHERE
3188
+### @1=1 /* INT meta=0 nullable=1 is_null=0 */
3189
+# at #
3190
+#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0
3191
+SET TIMESTAMP=1000000000/*!*/;
3192
+COMMIT
3193
+/*!*/;
3194
+# at #
3195
+#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4
3196
+DELIMITER ;
3197
+# End of log file
3198
+ROLLBACK /* added by mysqlbinlog */;
3199
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
1982
diff -ruN a/mysql-test/suite/binlog/r/binlog_base64_flag.result b/mysql-test/suite/binlog/r/binlog_base64_flag.result
1983
--- a/mysql-test/suite/binlog/r/binlog_base64_flag.result 2011-04-12 15:39:02.000000000 +0300
1984
+++ b/mysql-test/suite/binlog/r/binlog_base64_flag.result 2011-06-16 00:55:36.116404792 +0300
1985
@@ -93,6 +93,7 @@
1986
drop table t1, char63_utf8, char128_utf8;
1987
call mtr.add_suppression("Slave SQL.*master suffers from this bug: http:..bugs.mysql.com.bug.php.id=37426.* Error_code: 1105");
1988
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
1989
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
1990
#
1991
# Bug #54393: crash and/or valgrind errors in
1992
# mysql_client_binlog_statement
1993
diff -ruN a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
1994
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result 2011-04-12 15:39:03.000000000 +0300
1995
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result 2011-06-16 00:55:36.191402215 +0300
1996
@@ -331,7 +331,7 @@
1997
master-bin.000001 # Query # # use `test`; insert into t1 values( 243 )
1998
master-bin.000001 # Query # # use `test`; insert into t1 values( 242 )
1999
master-bin.000001 # Query # # use `test`; insert into t1 values( 241 )
2000
-master-bin.000001 # Query # # use `test`; insert into t1 values( 240 )
2001
+master-bin.000001 # Query # # use `test`; insert into t1 values( <binlog_start> )
2002
master-bin.000001 # Query # # use `test`; insert into t1 values( 239 )
2003
master-bin.000001 # Query # # use `test`; insert into t1 values( 238 )
2004
master-bin.000001 # Query # # use `test`; insert into t1 values( 237 )
2005
diff -ruN a/mysql-test/suite/binlog/t/binlog_base64_flag.test b/mysql-test/suite/binlog/t/binlog_base64_flag.test
2006
--- a/mysql-test/suite/binlog/t/binlog_base64_flag.test 2011-04-12 15:38:59.000000000 +0300
2007
+++ b/mysql-test/suite/binlog/t/binlog_base64_flag.test 2011-06-16 00:55:36.117404757 +0300
2008
@@ -153,6 +153,7 @@
2009
2010
call mtr.add_suppression("Slave SQL.*master suffers from this bug: http:..bugs.mysql.com.bug.php.id=37426.* Error_code: 1105");
2011
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
2012
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
2013
2014
--echo #
2015
--echo # Bug #54393: crash and/or valgrind errors in
3200
2016
diff -ruN a/mysql-test/suite/binlog/t/binlog_incident.test b/mysql-test/suite/binlog/t/binlog_incident.test
3201
--- a/mysql-test/suite/binlog/t/binlog_incident.test 2011-06-15 18:45:27.367749712 +0300
3202
+++ b/mysql-test/suite/binlog/t/binlog_incident.test 2011-06-15 18:45:38.751373198 +0300
2017
--- a/mysql-test/suite/binlog/t/binlog_incident.test 2011-04-12 15:38:59.000000000 +0300
2018
+++ b/mysql-test/suite/binlog/t/binlog_incident.test 2011-06-16 00:55:36.118404723 +0300
3203
2019
@@ -4,6 +4,7 @@
3204
2020
3205
2021
source include/have_log_bin.inc;
3218
2034
eval SELECT cont LIKE '%RELOAD DATABASE; # Shall generate syntax error%' AS `Contain RELOAD DATABASE` FROM (SELECT load_file('$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql') AS cont) AS tbl;
3219
2035
--enable_query_log
3220
2036
diff -ruN a/mysql-test/suite/binlog/t/binlog_killed_simulate.test b/mysql-test/suite/binlog/t/binlog_killed_simulate.test
3221
--- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test 2011-06-15 18:45:27.371749580 +0300
3222
+++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test 2011-06-15 18:45:38.754373096 +0300
2037
--- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test 2011-04-12 15:38:59.000000000 +0300
2038
+++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test 2011-06-16 00:55:36.120404654 +0300
3223
2039
@@ -1,5 +1,6 @@
3224
2040
-- source include/have_debug.inc
3225
2041
-- source include/have_binlog_format_statement.inc
3237
2053
eval select
3238
2054
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
3239
2055
diff -ruN a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test
3240
--- a/mysql-test/suite/binlog/t/binlog_killed.test 2011-06-15 18:45:27.370749613 +0300
3241
+++ b/mysql-test/suite/binlog/t/binlog_killed.test 2011-06-15 18:45:38.753373130 +0300
2056
--- a/mysql-test/suite/binlog/t/binlog_killed.test 2011-04-12 15:38:59.000000000 +0300
2057
+++ b/mysql-test/suite/binlog/t/binlog_killed.test 2011-06-16 00:55:36.121404619 +0300
3242
2058
@@ -1,5 +1,6 @@
3243
2059
-- source include/have_innodb.inc
3244
2060
-- source include/have_binlog_format_statement.inc
3258
2074
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
3259
2075
diff -ruN a/mysql-test/suite/binlog/t/binlog_row_annotate-master.opt b/mysql-test/suite/binlog/t/binlog_row_annotate-master.opt
3260
2076
--- a/mysql-test/suite/binlog/t/binlog_row_annotate-master.opt 1970-01-01 03:00:00.000000000 +0300
3261
+++ b/mysql-test/suite/binlog/t/binlog_row_annotate-master.opt 2011-06-15 18:45:38.754373096 +0300
2077
+++ b/mysql-test/suite/binlog/t/binlog_row_annotate-master.opt 2011-06-16 00:55:36.123404551 +0300
3262
2078
@@ -0,0 +1 @@
3263
2079
+--timezone=GMT-3 --binlog-do-db=test1 --binlog-do-db=test2 --binlog-do-db=test3
3264
2080
diff -ruN a/mysql-test/suite/binlog/t/binlog_row_annotate.test b/mysql-test/suite/binlog/t/binlog_row_annotate.test
3265
2081
--- a/mysql-test/suite/binlog/t/binlog_row_annotate.test 1970-01-01 03:00:00.000000000 +0300
3266
+++ b/mysql-test/suite/binlog/t/binlog_row_annotate.test 2011-06-15 18:45:38.752373164 +0300
2082
+++ b/mysql-test/suite/binlog/t/binlog_row_annotate.test 2011-06-16 00:55:36.125404482 +0300
3267
2083
@@ -0,0 +1,189 @@
3268
2084
+###############################################################################
3269
2085
+# WL47: Store in binlog text of statements that caused RBR events
3456
2272
+
3457
2273
diff -ruN a/mysql-test/suite/rpl/r/percona_mixed_binlog_direct.result b/mysql-test/suite/rpl/r/percona_mixed_binlog_direct.result
3458
2274
--- a/mysql-test/suite/rpl/r/percona_mixed_binlog_direct.result 1970-01-01 03:00:00.000000000 +0300
3459
+++ b/mysql-test/suite/rpl/r/percona_mixed_binlog_direct.result 2011-06-15 18:45:39.006364762 +0300
3460
@@ -0,0 +1,1465 @@
3461
+stop slave;
3462
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
3463
+reset master;
3464
+reset slave;
3465
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
3466
+start slave;
2275
+++ b/mysql-test/suite/rpl/r/percona_mixed_binlog_direct.result 2011-06-16 00:55:36.129404345 +0300
2276
@@ -0,0 +1,1462 @@
2277
+include/master-slave.inc
2278
+[connection master]
3467
2279
+set @@session.binlog_direct_non_transactional_updates= TRUE;
3468
2280
+#########################################################################
3469
2281
+# CONFIGURATION
4923
3735
+#########################################################################
4924
3736
+# CLEAN
4925
3737
+#########################################################################
3738
+include/rpl_end.inc
4926
3739
diff -ruN a/mysql-test/suite/rpl/r/percona_row_binlog_direct.result b/mysql-test/suite/rpl/r/percona_row_binlog_direct.result
4927
3740
--- a/mysql-test/suite/rpl/r/percona_row_binlog_direct.result 1970-01-01 03:00:00.000000000 +0300
4928
+++ b/mysql-test/suite/rpl/r/percona_row_binlog_direct.result 2011-06-15 18:45:39.007364730 +0300
4929
@@ -0,0 +1,1925 @@
4930
+stop slave;
4931
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
4932
+reset master;
4933
+reset slave;
4934
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
4935
+start slave;
3741
+++ b/mysql-test/suite/rpl/r/percona_row_binlog_direct.result 2011-06-16 00:55:36.134404172 +0300
3742
@@ -0,0 +1,1922 @@
3743
+include/master-slave.inc
3744
+[connection master]
4936
3745
+set @@session.binlog_direct_non_transactional_updates= TRUE;
4937
3746
+#########################################################################
4938
3747
+# CONFIGURATION
6852
5661
+#########################################################################
6853
5662
+# CLEAN
6854
5663
+#########################################################################
5664
+include/rpl_end.inc
6855
5665
diff -ruN a/mysql-test/suite/rpl/r/percona_rpl_max_binlog_packet.result b/mysql-test/suite/rpl/r/percona_rpl_max_binlog_packet.result
6856
5666
--- a/mysql-test/suite/rpl/r/percona_rpl_max_binlog_packet.result 1970-01-01 03:00:00.000000000 +0300
6857
+++ b/mysql-test/suite/rpl/r/percona_rpl_max_binlog_packet.result 2011-06-15 18:45:38.987365393 +0300
6858
@@ -0,0 +1,116 @@
6859
+stop slave;
6860
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
6861
+reset master;
6862
+reset slave;
6863
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
6864
+start slave;
5667
+++ b/mysql-test/suite/rpl/r/percona_rpl_max_binlog_packet.result 2011-06-16 00:55:36.136404105 +0300
5668
@@ -0,0 +1,114 @@
5669
+include/master-slave.inc
5670
+[connection master]
6865
5671
+call mtr.add_suppression("Slave I/O: Got a packet bigger than 'max_allowed_packet' bytes, Error_code: 1153");
6866
5672
+call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log:");
6867
5673
+DROP TABLE IF EXISTS t1;
6872
5678
+# The slave I/O thread must stop after receiving
6873
5679
+# ER_MASTER_FATAL_ERROR_READING_BINLOG error message from master.
6874
5680
+########################################################################
5681
+include/wait_for_slave_io_to_stop.inc
6875
5682
+Slave_IO_Running = No (expect No)
6876
5683
+SELECT "Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master'" AS Last_IO_Error;
6877
5684
+Last_IO_Error
6899
5706
+########################################################################
6900
5707
+# The slave I/O thread must stop with the ER_NET_PACKET_TOO_LARGE error
6901
5708
+########################################################################
5709
+include/wait_for_slave_io_to_stop.inc
6902
5710
+Slave_IO_Running = No (expect No)
6903
5711
+SELECT "Got a packet bigger than 'max_allowed_packet' bytes" AS Last_IO_Error;
6904
5712
+Last_IO_Error
6973
5781
+DROP TABLE t1;
6974
5782
+SET @@global.max_binlog_packet = @old_global_max_binlog_packet;
6975
5783
diff -ruN a/mysql-test/suite/rpl/r/rpl_bug31076.result b/mysql-test/suite/rpl/r/rpl_bug31076.result
6976
--- a/mysql-test/suite/rpl/r/rpl_bug31076.result 2011-06-15 18:45:27.605741841 +0300
6977
+++ b/mysql-test/suite/rpl/r/rpl_bug31076.result 2011-06-15 18:45:38.997365058 +0300
6978
@@ -4,6 +4,8 @@
6979
reset slave;
6980
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
6981
start slave;
5784
--- a/mysql-test/suite/rpl/r/rpl_bug31076.result 2011-04-12 15:39:45.000000000 +0300
5785
+++ b/mysql-test/suite/rpl/r/rpl_bug31076.result 2011-06-16 00:55:36.138404035 +0300
5786
@@ -1,5 +1,7 @@
5787
include/master-slave.inc
5788
[connection master]
6982
5789
+SET @saved_slave_type_conversions = @@slave_type_conversions;
6983
5790
+SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY';
6984
5791
CREATE DATABASE track;
6985
5792
USE track;
6986
5793
CREATE TABLE `visits` (
6987
@@ -65,5 +67,6 @@
5794
@@ -61,6 +63,7 @@
6988
5795
SELECT * FROM visits_events;
6989
5796
event_id visit_id timestamp src data visits_events_id
6990
5797
20000 21231038 2007-09-18 03:59:02 Downloads/MySQL-4.1/mysql-4.1.12a-win32.zip 33712207
6991
5798
+SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
6992
5799
DROP DATABASE track;
6993
5800
End of 5.1 tests
5801
include/rpl_end.inc
6994
5802
diff -ruN a/mysql-test/suite/rpl/r/rpl_colSize.result b/mysql-test/suite/rpl/r/rpl_colSize.result
6995
--- a/mysql-test/suite/rpl/r/rpl_colSize.result 2011-06-15 18:45:27.613741576 +0300
6996
+++ b/mysql-test/suite/rpl/r/rpl_colSize.result 2011-06-15 18:45:39.005364795 +0300
6997
@@ -9,6 +9,8 @@
5803
--- a/mysql-test/suite/rpl/r/rpl_colSize.result 2011-04-12 15:39:45.000000000 +0300
5804
+++ b/mysql-test/suite/rpl/r/rpl_colSize.result 2011-06-16 00:55:36.139404001 +0300
5805
@@ -5,6 +5,8 @@
6998
5806
*** Create "wider" table on slave ***
6999
5807
STOP SLAVE;
7000
5808
RESET SLAVE;
7003
5811
CREATE TABLE t1 (
7004
5812
a float (47),
7005
5813
b double (143,9),
7006
@@ -177,3 +179,4 @@
5814
@@ -173,4 +175,5 @@
7007
5815
) ENGINE=MyISAM DEFAULT CHARSET=latin1
7008
5816
*** Cleanup ***
7009
5817
DROP TABLE t1;
7010
5818
+SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
7011
diff -ruN a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
7012
--- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result 2011-06-15 18:45:27.596742138 +0300
7013
+++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result 2011-06-15 18:45:38.989365323 +0300
7014
@@ -55,7 +55,7 @@
7015
*** Test lock wait timeout ***
7016
include/stop_slave.inc
7017
DELETE FROM t2;
7018
-CHANGE MASTER TO MASTER_LOG_POS=MASTER_POS_BEGIN;
7019
+CHANGE MASTER TO MASTER_LOG_POS=<master_pos_begin>;
7020
BEGIN;
7021
SELECT * FROM t1 FOR UPDATE;
7022
a
7023
@@ -81,7 +81,7 @@
7024
SET global max_relay_log_size=0;
7025
include/stop_slave.inc
7026
DELETE FROM t2;
7027
-CHANGE MASTER TO MASTER_LOG_POS=MASTER_POS_BEGIN;
7028
+CHANGE MASTER TO MASTER_LOG_POS=<master_pos_begin>;
7029
BEGIN;
7030
SELECT * FROM t1 FOR UPDATE;
7031
a
7032
diff -ruN a/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result b/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
7033
--- a/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result 2011-06-15 18:45:27.609741708 +0300
7034
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result 2011-06-15 18:45:39.001364930 +0300
7035
@@ -9,6 +9,8 @@
5819
include/rpl_end.inc
5820
diff -ruN a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
5821
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result 2011-04-12 15:39:46.000000000 +0300
5822
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result 2011-06-16 00:55:36.142403898 +0300
5823
@@ -457,11 +457,11 @@
5824
(3,@b1,DEFAULT,'QA',DEFAULT);
5825
5826
********************************************
5827
-*** Expect slave to fail with Error 1535 ***
5828
+*** Expect slave to fail with Error 1677 ***
5829
********************************************
5830
5831
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5832
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254'
5833
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5834
+Last_SQL_Error = 'Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)''
5835
5836
*** Drop t10 ***
5837
DROP TABLE t10;
5838
@@ -493,11 +493,11 @@
5839
(3,@b1,DEFAULT,'QA',DEFAULT);
5840
5841
********************************************
5842
-*** Expect slave to fail with Error 1535 ***
5843
+*** Expect slave to fail with Error 1677 ***
5844
********************************************
5845
5846
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5847
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15'
5848
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5849
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)''
5850
5851
*** Drop t11 ***
5852
DROP TABLE t11;
5853
@@ -1328,11 +1328,11 @@
5854
(3,@b1,DEFAULT,'QA',DEFAULT);
5855
5856
********************************************
5857
-*** Expect slave to fail with Error 1535 ***
5858
+*** Expect slave to fail with Error 1677 ***
5859
********************************************
5860
5861
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5862
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254'
5863
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5864
+Last_SQL_Error = 'Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)''
5865
5866
*** Drop t10 ***
5867
DROP TABLE t10;
5868
@@ -1364,11 +1364,11 @@
5869
(3,@b1,DEFAULT,'QA',DEFAULT);
5870
5871
********************************************
5872
-*** Expect slave to fail with Error 1535 ***
5873
+*** Expect slave to fail with Error 1677 ***
5874
********************************************
5875
5876
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5877
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15'
5878
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5879
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)''
5880
5881
*** Drop t11 ***
5882
DROP TABLE t11;
5883
@@ -2199,11 +2199,11 @@
5884
(3,@b1,DEFAULT,'QA',DEFAULT);
5885
5886
********************************************
5887
-*** Expect slave to fail with Error 1535 ***
5888
+*** Expect slave to fail with Error 1677 ***
5889
********************************************
5890
5891
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5892
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254'
5893
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5894
+Last_SQL_Error = 'Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)''
5895
5896
*** Drop t10 ***
5897
DROP TABLE t10;
5898
@@ -2235,11 +2235,11 @@
5899
(3,@b1,DEFAULT,'QA',DEFAULT);
5900
5901
********************************************
5902
-*** Expect slave to fail with Error 1535 ***
5903
+*** Expect slave to fail with Error 1677 ***
5904
********************************************
5905
5906
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5907
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15'
5908
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5909
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)''
5910
5911
*** Drop t11 ***
5912
DROP TABLE t11;
5913
diff -ruN a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
5914
--- a/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result 2011-04-12 15:39:46.000000000 +0300
5915
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result 2011-06-16 00:55:36.145403795 +0300
5916
@@ -457,11 +457,11 @@
5917
(3,@b1,DEFAULT,'QA',DEFAULT);
5918
5919
********************************************
5920
-*** Expect slave to fail with Error 1535 ***
5921
+*** Expect slave to fail with Error 1677 ***
5922
********************************************
5923
5924
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5925
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254'
5926
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5927
+Last_SQL_Error = 'Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)''
5928
5929
*** Drop t10 ***
5930
DROP TABLE t10;
5931
@@ -493,11 +493,11 @@
5932
(3,@b1,DEFAULT,'QA',DEFAULT);
5933
5934
********************************************
5935
-*** Expect slave to fail with Error 1535 ***
5936
+*** Expect slave to fail with Error 1677 ***
5937
********************************************
5938
5939
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5940
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15'
5941
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5942
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)''
5943
5944
*** Drop t11 ***
5945
DROP TABLE t11;
5946
@@ -1328,11 +1328,11 @@
5947
(3,@b1,DEFAULT,'QA',DEFAULT);
5948
5949
********************************************
5950
-*** Expect slave to fail with Error 1535 ***
5951
+*** Expect slave to fail with Error 1677 ***
5952
********************************************
5953
5954
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5955
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254'
5956
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5957
+Last_SQL_Error = 'Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)''
5958
5959
*** Drop t10 ***
5960
DROP TABLE t10;
5961
@@ -1364,11 +1364,11 @@
5962
(3,@b1,DEFAULT,'QA',DEFAULT);
5963
5964
********************************************
5965
-*** Expect slave to fail with Error 1535 ***
5966
+*** Expect slave to fail with Error 1677 ***
5967
********************************************
5968
5969
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5970
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15'
5971
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5972
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)''
5973
5974
*** Drop t11 ***
5975
DROP TABLE t11;
5976
@@ -2199,11 +2199,11 @@
5977
(3,@b1,DEFAULT,'QA',DEFAULT);
5978
5979
********************************************
5980
-*** Expect slave to fail with Error 1535 ***
5981
+*** Expect slave to fail with Error 1677 ***
5982
********************************************
5983
5984
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
5985
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254'
5986
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
5987
+Last_SQL_Error = 'Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)''
5988
5989
*** Drop t10 ***
5990
DROP TABLE t10;
5991
@@ -2235,11 +2235,11 @@
5992
(3,@b1,DEFAULT,'QA',DEFAULT);
5993
5994
********************************************
5995
-*** Expect slave to fail with Error 1535 ***
5996
+*** Expect slave to fail with Error 1677 ***
5997
********************************************
5998
5999
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6000
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15'
6001
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6002
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)''
6003
6004
*** Drop t11 ***
6005
DROP TABLE t11;
6006
diff -ruN a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result
6007
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result 2011-04-12 15:39:46.000000000 +0300
6008
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result 2011-06-16 00:55:36.147403726 +0300
6009
@@ -5,6 +5,8 @@
7036
6010
*** On Slave ***
7037
6011
STOP SLAVE;
7038
6012
RESET SLAVE;
7041
6015
CREATE TABLE t1 (a INT, b INT PRIMARY KEY, c CHAR(20),
7042
6016
d FLOAT DEFAULT '2.00',
7043
6017
e CHAR(4) DEFAULT 'TEST')
7044
@@ -32,6 +34,7 @@
6018
@@ -28,6 +30,7 @@
7045
6019
1 2 TEXAS 2 TEST
7046
6020
2 1 AUSTIN 2 TEST
7047
6021
3 4 QA 2 TEST
7049
6023
*** Drop t1 ***
7050
6024
DROP TABLE t1;
7051
6025
*** Create t2 on slave ***
7052
@@ -54,7 +57,7 @@
6026
@@ -50,8 +53,8 @@
7053
6027
3 4 QA TESTING
7054
6028
*** Start Slave ***
7055
6029
START SLAVE;
7056
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
7057
+Last_SQL_Error = Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)'
6030
-include/wait_for_slave_sql_error.inc [errno=1535]
6031
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.'
6032
+include/wait_for_slave_sql_error.inc [errno=1677]
6033
+Last_SQL_Error = 'Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)''
7058
6034
STOP SLAVE;
7059
6035
RESET SLAVE;
7060
6036
SELECT * FROM t2 ORDER BY a;
7061
@@ -81,10 +84,10 @@
6037
@@ -78,10 +81,10 @@
7062
6038
set @b1 = concat(@b1,@b1);
7063
6039
INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
7064
6040
********************************************
7065
6041
-*** Expect slave to fail with Error 1535 ***
7066
6042
+*** Expect slave to fail with Error 1677 ***
7067
6043
********************************************
7068
--source include/wait_for_slave_sql_error_and_skip.inc
7069
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
7070
+Last_SQL_Error = Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)'
7071
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7072
include/start_slave.inc
6044
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6045
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3'
6046
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6047
+Last_SQL_Error = 'Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)''
7073
6048
*** Drop t3 ***
7074
@@ -106,10 +109,10 @@
6049
DROP TABLE t3;
6050
*** Create t4 on slave ***
6051
@@ -101,10 +104,10 @@
7075
6052
INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
7076
6053
(30000.22,4,'QA TESTING');
7077
6054
********************************************
7078
6055
-*** Expect slave to fail with Error 1535 ***
7079
6056
+*** Expect slave to fail with Error 1677 ***
7080
6057
********************************************
7081
--source include/wait_for_slave_sql_error_and_skip.inc
7082
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
7083
+Last_SQL_Error = Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)'
7084
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7085
include/start_slave.inc
6058
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6059
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3'
6060
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6061
+Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)''
7086
6062
*** Drop t4 ***
7087
@@ -131,10 +134,10 @@
6063
DROP TABLE t4;
6064
*** Create t5 on slave ***
6065
@@ -124,10 +127,10 @@
7088
6066
INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
7089
6067
(2,'JOE',300.01,0,'b2b2',1.0000009);
7090
6068
********************************************
7091
6069
-*** Expect slave to fail with Error 1535 ***
7092
6070
+*** Expect slave to fail with Error 1677 ***
7093
6071
********************************************
7094
--source include/wait_for_slave_sql_error_and_skip.inc
7095
-Last_SQL_Error = Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
7096
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)'
7097
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7098
include/start_slave.inc
6072
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6073
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246'
6074
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6075
+Last_SQL_Error = 'Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)''
7099
6076
*** Drop t5 ***
7100
@@ -155,9 +158,9 @@
6077
DROP TABLE t5;
6078
*** Create t6 on slave ***
6079
@@ -146,10 +149,10 @@
7101
6080
INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
7102
6081
(2,'JOE',300.01,0);
7103
6082
********************************************
7104
6083
-*** Expect slave to fail with Error 1535 ***
7105
6084
+*** Expect slave to fail with Error 1677 ***
7106
6085
********************************************
7107
-Last_SQL_Error = Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
7108
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)'
6086
-include/wait_for_slave_sql_error.inc [errno=1535]
6087
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3'
6088
+include/wait_for_slave_sql_error.inc [errno=1677]
6089
+Last_SQL_Error = 'Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)''
7109
6090
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
7110
6091
*** Drop t6 ***
7111
6092
DROP TABLE t6;
7112
@@ -253,10 +256,10 @@
6093
@@ -246,16 +249,16 @@
7113
6094
set @b1 = concat(@b1,@b1);
7114
6095
INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
7115
6096
********************************************
7116
6097
-*** Expect slave to fail with Error 1535 ***
7117
6098
+*** Expect slave to fail with Error 1677 ***
7118
6099
********************************************
7119
--source include/wait_for_slave_sql_error_and_skip.inc
7120
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
7121
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
7122
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7123
include/start_slave.inc
6100
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6101
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5'
6102
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6103
+Last_SQL_Error = 'Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double''
7124
6104
*** Drop t10 ***
7125
@@ -264,7 +267,7 @@
6105
DROP TABLE t10;
7126
6106
*** Create t11 on slave ***
7127
6107
STOP SLAVE;
7128
6108
RESET SLAVE;
7131
6111
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
7132
6112
*** Create t11 on Master ***
7133
6113
CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
7134
@@ -277,10 +280,10 @@
6114
@@ -268,10 +271,10 @@
7135
6115
set @b1 = concat(@b1,@b1);
7136
6116
INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
7137
6117
********************************************
7138
6118
-*** Expect slave to fail with Error 1535 ***
7139
6119
+*** Expect slave to fail with Error 1677 ***
7140
6120
********************************************
7141
--source include/wait_for_slave_sql_error_and_skip.inc
7142
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
7143
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
7144
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7145
include/start_slave.inc
6121
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6122
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252'
6123
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6124
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)''
7146
6125
*** Drop t11 ***
7147
@@ -593,10 +596,10 @@
6126
DROP TABLE t11;
6127
*** Create t12 on slave ***
6128
@@ -584,10 +587,10 @@
7148
6129
*** Master Data Insert ***
7149
6130
INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
7150
6131
********************************************
7151
6132
-*** Expect slave to fail with Error 1535 ***
7152
6133
+*** Expect slave to fail with Error 1677 ***
7153
6134
********************************************
7154
--source include/wait_for_slave_sql_error_and_skip.inc
7155
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
7156
+Last_SQL_Error = Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
7157
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7158
include/start_slave.inc
6135
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6136
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2'
6137
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6138
+Last_SQL_Error = 'Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)''
7159
6139
** DROP table t17 ***
7160
diff -ruN a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
7161
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result 2011-06-15 18:45:27.606741807 +0300
7162
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result 2011-06-15 18:45:38.998365025 +0300
7163
@@ -461,11 +461,11 @@
7164
(3,@b1,DEFAULT,'QA',DEFAULT);
7165
7166
********************************************
7167
-*** Expect slave to fail with Error 1535 ***
7168
+*** Expect slave to fail with Error 1677 ***
7169
********************************************
7170
7171
--source include/wait_for_slave_sql_error_and_skip.inc
7172
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
7173
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
7174
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7175
include/start_slave.inc
7176
7177
@@ -499,11 +499,11 @@
7178
(3,@b1,DEFAULT,'QA',DEFAULT);
7179
7180
********************************************
7181
-*** Expect slave to fail with Error 1535 ***
7182
+*** Expect slave to fail with Error 1677 ***
7183
********************************************
7184
7185
--source include/wait_for_slave_sql_error_and_skip.inc
7186
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
7187
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
7188
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7189
include/start_slave.inc
7190
7191
@@ -1334,11 +1334,11 @@
7192
(3,@b1,DEFAULT,'QA',DEFAULT);
7193
7194
********************************************
7195
-*** Expect slave to fail with Error 1535 ***
7196
+*** Expect slave to fail with Error 1677 ***
7197
********************************************
7198
7199
--source include/wait_for_slave_sql_error_and_skip.inc
7200
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
7201
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
7202
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7203
include/start_slave.inc
7204
7205
@@ -1372,11 +1372,11 @@
7206
(3,@b1,DEFAULT,'QA',DEFAULT);
7207
7208
********************************************
7209
-*** Expect slave to fail with Error 1535 ***
7210
+*** Expect slave to fail with Error 1677 ***
7211
********************************************
7212
7213
--source include/wait_for_slave_sql_error_and_skip.inc
7214
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
7215
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
7216
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7217
include/start_slave.inc
7218
7219
@@ -2207,11 +2207,11 @@
7220
(3,@b1,DEFAULT,'QA',DEFAULT);
7221
7222
********************************************
7223
-*** Expect slave to fail with Error 1535 ***
7224
+*** Expect slave to fail with Error 1677 ***
7225
********************************************
7226
7227
--source include/wait_for_slave_sql_error_and_skip.inc
7228
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
7229
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
7230
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7231
include/start_slave.inc
7232
7233
@@ -2245,11 +2245,11 @@
7234
(3,@b1,DEFAULT,'QA',DEFAULT);
7235
7236
********************************************
7237
-*** Expect slave to fail with Error 1535 ***
7238
+*** Expect slave to fail with Error 1677 ***
7239
********************************************
7240
7241
--source include/wait_for_slave_sql_error_and_skip.inc
7242
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
7243
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
7244
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7245
include/start_slave.inc
7246
7247
diff -ruN a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
7248
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result 2011-06-15 18:45:27.603741906 +0300
7249
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result 2011-06-15 18:45:38.995365128 +0300
7250
@@ -461,11 +461,11 @@
7251
(3,@b1,DEFAULT,'QA',DEFAULT);
7252
7253
********************************************
7254
-*** Expect slave to fail with Error 1535 ***
7255
+*** Expect slave to fail with Error 1677 ***
7256
********************************************
7257
7258
--source include/wait_for_slave_sql_error_and_skip.inc
7259
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
7260
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
7261
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7262
include/start_slave.inc
7263
7264
@@ -499,11 +499,11 @@
7265
(3,@b1,DEFAULT,'QA',DEFAULT);
7266
7267
********************************************
7268
-*** Expect slave to fail with Error 1535 ***
7269
+*** Expect slave to fail with Error 1677 ***
7270
********************************************
7271
7272
--source include/wait_for_slave_sql_error_and_skip.inc
7273
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
7274
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
7275
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7276
include/start_slave.inc
7277
7278
@@ -1334,11 +1334,11 @@
7279
(3,@b1,DEFAULT,'QA',DEFAULT);
7280
7281
********************************************
7282
-*** Expect slave to fail with Error 1535 ***
7283
+*** Expect slave to fail with Error 1677 ***
7284
********************************************
7285
7286
--source include/wait_for_slave_sql_error_and_skip.inc
7287
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
7288
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
7289
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7290
include/start_slave.inc
7291
7292
@@ -1372,11 +1372,11 @@
7293
(3,@b1,DEFAULT,'QA',DEFAULT);
7294
7295
********************************************
7296
-*** Expect slave to fail with Error 1535 ***
7297
+*** Expect slave to fail with Error 1677 ***
7298
********************************************
7299
7300
--source include/wait_for_slave_sql_error_and_skip.inc
7301
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
7302
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
7303
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7304
include/start_slave.inc
7305
7306
@@ -2207,11 +2207,11 @@
7307
(3,@b1,DEFAULT,'QA',DEFAULT);
7308
7309
********************************************
7310
-*** Expect slave to fail with Error 1535 ***
7311
+*** Expect slave to fail with Error 1677 ***
7312
********************************************
7313
7314
--source include/wait_for_slave_sql_error_and_skip.inc
7315
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
7316
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
7317
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7318
include/start_slave.inc
7319
7320
@@ -2245,11 +2245,11 @@
7321
(3,@b1,DEFAULT,'QA',DEFAULT);
7322
7323
********************************************
7324
-*** Expect slave to fail with Error 1535 ***
7325
+*** Expect slave to fail with Error 1677 ***
7326
********************************************
7327
7328
--source include/wait_for_slave_sql_error_and_skip.inc
7329
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
7330
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
7331
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7332
include/start_slave.inc
7333
7334
diff -ruN a/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
7335
--- a/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result 2011-06-15 18:45:27.610741675 +0300
7336
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result 2011-06-15 18:45:39.002364897 +0300
7337
@@ -9,6 +9,8 @@
6140
DROP TABLE t17;
6141
include/rpl_end.inc
6142
diff -ruN a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result
6143
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result 2011-04-12 15:39:46.000000000 +0300
6144
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result 2011-06-16 00:55:36.148403692 +0300
6145
@@ -5,6 +5,8 @@
7338
6146
*** On Slave ***
7339
6147
STOP SLAVE;
7340
6148
RESET SLAVE;
7343
6151
CREATE TABLE t1 (a INT, b INT PRIMARY KEY, c CHAR(20),
7344
6152
d FLOAT DEFAULT '2.00',
7345
6153
e CHAR(4) DEFAULT 'TEST')
7346
@@ -32,6 +34,7 @@
6154
@@ -28,6 +30,7 @@
7347
6155
1 2 TEXAS 2 TEST
7348
6156
2 1 AUSTIN 2 TEST
7349
6157
3 4 QA 2 TEST
7351
6159
*** Drop t1 ***
7352
6160
DROP TABLE t1;
7353
6161
*** Create t2 on slave ***
7354
@@ -54,7 +57,7 @@
6162
@@ -50,8 +53,8 @@
7355
6163
3 4 QA TESTING
7356
6164
*** Start Slave ***
7357
6165
START SLAVE;
7358
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
7359
+Last_SQL_Error = Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)'
6166
-include/wait_for_slave_sql_error.inc [errno=1535]
6167
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.'
6168
+include/wait_for_slave_sql_error.inc [errno=1677]
6169
+Last_SQL_Error = 'Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)''
7360
6170
STOP SLAVE;
7361
6171
RESET SLAVE;
7362
6172
SELECT * FROM t2 ORDER BY a;
7363
@@ -81,10 +84,10 @@
6173
@@ -78,10 +81,10 @@
7364
6174
set @b1 = concat(@b1,@b1);
7365
6175
INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
7366
6176
********************************************
7367
6177
-*** Expect slave to fail with Error 1535 ***
7368
6178
+*** Expect slave to fail with Error 1677 ***
7369
6179
********************************************
7370
--source include/wait_for_slave_sql_error_and_skip.inc
7371
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
7372
+Last_SQL_Error = Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)'
7373
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7374
include/start_slave.inc
6180
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6181
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3'
6182
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6183
+Last_SQL_Error = 'Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)''
7375
6184
*** Drop t3 ***
7376
@@ -106,10 +109,10 @@
6185
DROP TABLE t3;
6186
*** Create t4 on slave ***
6187
@@ -101,10 +104,10 @@
7377
6188
INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
7378
6189
(30000.22,4,'QA TESTING');
7379
6190
********************************************
7380
6191
-*** Expect slave to fail with Error 1535 ***
7381
6192
+*** Expect slave to fail with Error 1677 ***
7382
6193
********************************************
7383
--source include/wait_for_slave_sql_error_and_skip.inc
7384
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
7385
+Last_SQL_Error = Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)'
7386
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7387
include/start_slave.inc
6194
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6195
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3'
6196
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6197
+Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)''
7388
6198
*** Drop t4 ***
7389
@@ -131,10 +134,10 @@
6199
DROP TABLE t4;
6200
*** Create t5 on slave ***
6201
@@ -124,10 +127,10 @@
7390
6202
INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
7391
6203
(2,'JOE',300.01,0,'b2b2',1.0000009);
7392
6204
********************************************
7393
6205
-*** Expect slave to fail with Error 1535 ***
7394
6206
+*** Expect slave to fail with Error 1677 ***
7395
6207
********************************************
7396
--source include/wait_for_slave_sql_error_and_skip.inc
7397
-Last_SQL_Error = Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
7398
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)'
7399
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7400
include/start_slave.inc
6208
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6209
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246'
6210
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6211
+Last_SQL_Error = 'Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)''
7401
6212
*** Drop t5 ***
7402
@@ -155,9 +158,9 @@
6213
DROP TABLE t5;
6214
*** Create t6 on slave ***
6215
@@ -146,10 +149,10 @@
7403
6216
INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
7404
6217
(2,'JOE',300.01,0);
7405
6218
********************************************
7406
6219
-*** Expect slave to fail with Error 1535 ***
7407
6220
+*** Expect slave to fail with Error 1677 ***
7408
6221
********************************************
7409
-Last_SQL_Error = Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
7410
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)'
6222
-include/wait_for_slave_sql_error.inc [errno=1535]
6223
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3'
6224
+include/wait_for_slave_sql_error.inc [errno=1677]
6225
+Last_SQL_Error = 'Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)''
7411
6226
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
7412
6227
*** Drop t6 ***
7413
6228
DROP TABLE t6;
7414
@@ -253,10 +256,10 @@
6229
@@ -246,16 +249,16 @@
7415
6230
set @b1 = concat(@b1,@b1);
7416
6231
INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
7417
6232
********************************************
7418
6233
-*** Expect slave to fail with Error 1535 ***
7419
6234
+*** Expect slave to fail with Error 1677 ***
7420
6235
********************************************
7421
--source include/wait_for_slave_sql_error_and_skip.inc
7422
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
7423
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
7424
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7425
include/start_slave.inc
6236
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6237
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5'
6238
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6239
+Last_SQL_Error = 'Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double''
7426
6240
*** Drop t10 ***
7427
@@ -264,7 +267,7 @@
6241
DROP TABLE t10;
7428
6242
*** Create t11 on slave ***
7429
6243
STOP SLAVE;
7430
6244
RESET SLAVE;
7433
6247
c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
7434
6248
*** Create t11 on Master ***
7435
6249
CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
7436
@@ -277,10 +280,10 @@
6250
@@ -268,10 +271,10 @@
7437
6251
set @b1 = concat(@b1,@b1);
7438
6252
INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
7439
6253
********************************************
7440
6254
-*** Expect slave to fail with Error 1535 ***
7441
6255
+*** Expect slave to fail with Error 1677 ***
7442
6256
********************************************
7443
--source include/wait_for_slave_sql_error_and_skip.inc
7444
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
7445
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
7446
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7447
include/start_slave.inc
6257
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6258
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252'
6259
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6260
+Last_SQL_Error = 'Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)''
7448
6261
*** Drop t11 ***
7449
@@ -593,10 +596,10 @@
6262
DROP TABLE t11;
6263
*** Create t12 on slave ***
6264
@@ -584,10 +587,10 @@
7450
6265
*** Master Data Insert ***
7451
6266
INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
7452
6267
********************************************
7453
6268
-*** Expect slave to fail with Error 1535 ***
7454
6269
+*** Expect slave to fail with Error 1677 ***
7455
6270
********************************************
7456
--source include/wait_for_slave_sql_error_and_skip.inc
7457
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
7458
+Last_SQL_Error = Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
7459
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
7460
include/start_slave.inc
6271
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6272
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2'
6273
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6274
+Last_SQL_Error = 'Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)''
7461
6275
** DROP table t17 ***
7462
diff -ruN a/mysql-test/suite/rpl/r/rpl_log_pos.result b/mysql-test/suite/rpl/r/rpl_log_pos.result
7463
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result 2011-06-15 18:45:27.614741543 +0300
7464
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result 2011-06-15 18:45:39.005364795 +0300
7465
@@ -12,7 +12,7 @@
7466
change master to master_log_pos=MASTER_LOG_POS;
7467
Read_Master_Log_Pos 75
7468
start slave;
7469
-Last_IO_Error = Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master'
7470
+Last_IO_Error = Got fatal error 1236 from master when reading data from binary log: 'binlog truncated in the middle of event'
7471
include/stop_slave.inc
7472
show master status;
7473
File Position Binlog_Do_DB Binlog_Ignore_DB
7474
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_annotate_dont.result b/mysql-test/suite/rpl/r/rpl_row_annotate_dont.result
7475
--- a/mysql-test/suite/rpl/r/rpl_row_annotate_dont.result 1970-01-01 03:00:00.000000000 +0300
7476
+++ b/mysql-test/suite/rpl/r/rpl_row_annotate_dont.result 2011-06-15 18:45:38.993365195 +0300
7477
@@ -0,0 +1,126 @@
7478
+stop slave;
7479
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
7480
+reset master;
7481
+reset slave;
7482
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
7483
+start slave;
7484
+########################################################################
7485
+# TABLES ON MASTER
7486
+########################################################################
7487
+SELECT * FROM t1 ORDER BY a;
7488
+a b
7489
+0 1
7490
+SELECT * FROM t2 ORDER BY a;
7491
+a b
7492
+SELECT * FROM t3 ORDER BY a;
7493
+a b
7494
+1 1
7495
+2 2
7496
+3 3
7497
+SELECT * FROM t5 ORDER BY a;
7498
+a b
7499
+1 foo
7500
+2 bar
7501
+3 baz
7502
+4 g�s
7503
+5 g�s
7504
+########################################################################
7505
+# TABLES ON SLAVE: should be the same as on master
7506
+########################################################################
7507
+SELECT * FROM t1 ORDER BY a;
7508
+a b
7509
+0 1
7510
+SELECT * FROM t2 ORDER BY a;
7511
+a b
7512
+SELECT * FROM t3 ORDER BY a;
7513
+a b
7514
+1 1
7515
+2 2
7516
+3 3
7517
+SELECT * FROM t5 ORDER BY a;
7518
+a b
7519
+1 foo
7520
+2 bar
7521
+3 baz
7522
+4 g�s
7523
+5 g�s
7524
+########################################################################
7525
+# EVENTS ON SLAVE
7526
+# No Annotate_rows events should appear below
7527
+########################################################################
7528
+FLUSH LOGS;
7529
+show binlog events in 'slave-bin.000001' from <start_pos>;
7530
+Log_name Pos Event_type Server_id End_log_pos Info
7531
+slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test1
7532
+slave-bin.000001 # Query 1 # CREATE DATABASE test1
7533
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t1(a int primary key, b int)
7534
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t2(a int, b int)
7535
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t3(a int, b int)
7536
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t4(a int, b int)
7537
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t5 (
7538
+a INT PRIMARY KEY AUTO_INCREMENT,
7539
+b VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_bin
7540
+)
7541
+slave-bin.000001 # Query 1 # BEGIN
7542
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
7543
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7544
+slave-bin.000001 # Query 1 # COMMIT
7545
+slave-bin.000001 # Query 1 # BEGIN
7546
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
7547
+slave-bin.000001 # Update_rows 1 # table_id: # flags: STMT_END_F
7548
+slave-bin.000001 # Query 1 # COMMIT
7549
+slave-bin.000001 # Query 1 # BEGIN
7550
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
7551
+slave-bin.000001 # Update_rows 1 # table_id: #
7552
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7553
+slave-bin.000001 # Query 1 # COMMIT
7554
+slave-bin.000001 # Query 1 # BEGIN
7555
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
7556
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7557
+slave-bin.000001 # Query 1 # COMMIT
7558
+slave-bin.000001 # Query 1 # BEGIN
7559
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t3)
7560
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7561
+slave-bin.000001 # Query 1 # COMMIT
7562
+slave-bin.000001 # Query 1 # BEGIN
7563
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
7564
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
7565
+slave-bin.000001 # Delete_rows 1 # table_id: #
7566
+slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F
7567
+slave-bin.000001 # Query 1 # COMMIT
7568
+slave-bin.000001 # Query 1 # BEGIN
7569
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
7570
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7571
+slave-bin.000001 # Query 1 # COMMIT
7572
+slave-bin.000001 # Query 1 # BEGIN
7573
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
7574
+slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F
7575
+slave-bin.000001 # Query 1 # COMMIT
7576
+slave-bin.000001 # Query 1 # BEGIN
7577
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t5)
7578
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7579
+slave-bin.000001 # Query 1 # COMMIT
7580
+slave-bin.000001 # Query 1 # BEGIN
7581
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t5)
7582
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7583
+slave-bin.000001 # Query 1 # COMMIT
7584
+slave-bin.000001 # Query 1 # BEGIN
7585
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t5)
7586
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7587
+slave-bin.000001 # Query 1 # COMMIT
7588
+slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
7589
+#
7590
+########################################################################
7591
+# INSERTs DELAYED ON MASTERs
7592
+########################################################################
7593
+SET SESSION binlog_annotate_rows_events = ON;
7594
+INSERT DELAYED INTO test1.t4 VALUES (1,1);
7595
+FLUSH TABLES;
7596
+SELECT * FROM test1.t4 ORDER BY a;
7597
+a b
7598
+1 1
7599
+########################################################################
7600
+# ON SLAVE
7601
+# No Annotate_rows events should appear below
7602
+########################################################################
7603
+FLUSH LOGS;
7604
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_annotate_do.result b/mysql-test/suite/rpl/r/rpl_row_annotate_do.result
7605
--- a/mysql-test/suite/rpl/r/rpl_row_annotate_do.result 1970-01-01 03:00:00.000000000 +0300
7606
+++ b/mysql-test/suite/rpl/r/rpl_row_annotate_do.result 2011-06-15 18:45:38.993365195 +0300
7607
@@ -0,0 +1,144 @@
7608
+stop slave;
7609
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
7610
+reset master;
7611
+reset slave;
7612
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
7613
+start slave;
7614
+########################################################################
7615
+# TABLES ON MASTER
7616
+########################################################################
7617
+SELECT * FROM t1 ORDER BY a;
7618
+a b
7619
+0 1
7620
+SELECT * FROM t2 ORDER BY a;
7621
+a b
7622
+SELECT * FROM t3 ORDER BY a;
7623
+a b
7624
+1 1
7625
+2 2
7626
+3 3
7627
+SELECT * FROM t5 ORDER BY a;
7628
+a b
7629
+1 foo
7630
+2 bar
7631
+3 baz
7632
+4 g�s
7633
+5 g�s
7634
+########################################################################
7635
+# TABLES ON SLAVE: should be the same as on master
7636
+########################################################################
7637
+SELECT * FROM t1 ORDER BY a;
7638
+a b
7639
+0 1
7640
+SELECT * FROM t2 ORDER BY a;
7641
+a b
7642
+SELECT * FROM t3 ORDER BY a;
7643
+a b
7644
+1 1
7645
+2 2
7646
+3 3
7647
+SELECT * FROM t5 ORDER BY a;
7648
+a b
7649
+1 foo
7650
+2 bar
7651
+3 baz
7652
+4 g�s
7653
+5 g�s
7654
+########################################################################
7655
+# EVENTS ON SLAVE
7656
+# The following Annotate_rows events should appear below:
7657
+# - UPDATE t1 SET b = b + 1;
7658
+# - REPLACE t1 VALUES (1,1), (2,2), (3,3);
7659
+# - INSERT INTO t2 VALUES (1,1), (2,2), (3,3)
7660
+# - INSERT INTO t3 VALUES (1,1), (2,2), (3,3)
7661
+# - DELETE t1, t2 FROM <...>
7662
+# - INSERT INTO t2 VALUES (1,1), (2,2), (3,3)
7663
+# - DELETE xt1, t2 FROM <...>
7664
+# - INSERT INTO t5(b) VALUES <...> (3 instances)
7665
+########################################################################
7666
+FLUSH LOGS;
7667
+show binlog events in 'slave-bin.000001' from <start_pos>;
7668
+Log_name Pos Event_type Server_id End_log_pos Info
7669
+slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test1
7670
+slave-bin.000001 # Query 1 # CREATE DATABASE test1
7671
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t1(a int primary key, b int)
7672
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t2(a int, b int)
7673
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t3(a int, b int)
7674
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t4(a int, b int)
7675
+slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t5 (
7676
+a INT PRIMARY KEY AUTO_INCREMENT,
7677
+b VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_bin
7678
+)
7679
+slave-bin.000001 # Query 1 # BEGIN
7680
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
7681
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7682
+slave-bin.000001 # Query 1 # COMMIT
7683
+slave-bin.000001 # Query 1 # BEGIN
7684
+slave-bin.000001 # Annotate_rows 1 # UPDATE t1 SET b = b + 1
7685
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
7686
+slave-bin.000001 # Update_rows 1 # table_id: # flags: STMT_END_F
7687
+slave-bin.000001 # Query 1 # COMMIT
7688
+slave-bin.000001 # Query 1 # BEGIN
7689
+slave-bin.000001 # Annotate_rows 1 # REPLACE t1 VALUES (1,1), (2,2), (3,3)
7690
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
7691
+slave-bin.000001 # Update_rows 1 # table_id: #
7692
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7693
+slave-bin.000001 # Query 1 # COMMIT
7694
+slave-bin.000001 # Query 1 # BEGIN
7695
+slave-bin.000001 # Annotate_rows 1 # INSERT INTO t2 VALUES (1,1), (2,2), (3,3)
7696
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
7697
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7698
+slave-bin.000001 # Query 1 # COMMIT
7699
+slave-bin.000001 # Query 1 # BEGIN
7700
+slave-bin.000001 # Annotate_rows 1 # INSERT INTO t3 VALUES (1,1), (2,2), (3,3)
7701
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t3)
7702
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7703
+slave-bin.000001 # Query 1 # COMMIT
7704
+slave-bin.000001 # Query 1 # BEGIN
7705
+slave-bin.000001 # Annotate_rows 1 # DELETE t1, t2 FROM t1 INNER JOIN t2 INNER JOIN t3 WHERE t1.a=t2.a AND t2.a=t3.a
7706
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
7707
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
7708
+slave-bin.000001 # Delete_rows 1 # table_id: #
7709
+slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F
7710
+slave-bin.000001 # Query 1 # COMMIT
7711
+slave-bin.000001 # Query 1 # BEGIN
7712
+slave-bin.000001 # Annotate_rows 1 # INSERT INTO t2 VALUES (1,1), (2,2), (3,3)
7713
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
7714
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7715
+slave-bin.000001 # Query 1 # COMMIT
7716
+slave-bin.000001 # Query 1 # BEGIN
7717
+slave-bin.000001 # Annotate_rows 1 # DELETE xt1, t2 FROM xt1 INNER JOIN t2 INNER JOIN t3 WHERE xt1.a=t2.a AND t2.a=t3.a
7718
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
7719
+slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F
7720
+slave-bin.000001 # Query 1 # COMMIT
7721
+slave-bin.000001 # Query 1 # BEGIN
7722
+slave-bin.000001 # Annotate_rows 1 # INSERT INTO t5(b) VALUES ('foo'), ('bar'), ('baz')
7723
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t5)
7724
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7725
+slave-bin.000001 # Query 1 # COMMIT
7726
+slave-bin.000001 # Query 1 # BEGIN
7727
+slave-bin.000001 # Annotate_rows 1 # INSERT INTO t5(b) VALUES ('g�s')
7728
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t5)
7729
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7730
+slave-bin.000001 # Query 1 # COMMIT
7731
+slave-bin.000001 # Query 1 # BEGIN
7732
+slave-bin.000001 # Annotate_rows 1 # INSERT INTO t5(b) VALUES ('gås')
7733
+slave-bin.000001 # Table_map 1 # table_id: # (test1.t5)
7734
+slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
7735
+slave-bin.000001 # Query 1 # COMMIT
7736
+slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
7737
+#
7738
+########################################################################
7739
+# INSERTs DELAYED ON MASTERs
7740
+########################################################################
7741
+SET SESSION binlog_annotate_rows_events = ON;
7742
+INSERT DELAYED INTO test1.t4 VALUES (1,1);
7743
+FLUSH TABLES;
7744
+SELECT * FROM test1.t4 ORDER BY a;
7745
+a b
7746
+1 1
7747
+########################################################################
7748
+# ON SLAVE
7749
+# No Annotate_rows events should appear below
7750
+########################################################################
7751
+FLUSH LOGS;
6276
DROP TABLE t17;
6277
include/rpl_end.inc
7752
6278
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
7753
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result 2011-06-15 18:45:27.593742237 +0300
7754
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result 2011-06-15 18:45:38.987365393 +0300
7755
@@ -475,6 +475,8 @@
6279
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result 2011-04-12 15:39:51.000000000 +0300
6280
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result 2011-06-16 00:55:36.149403658 +0300
6281
@@ -467,6 +467,8 @@
7756
6282
CREATE TABLE t7 (i INT NOT NULL,
7757
6283
c CHAR(255) CHARACTER SET utf8 NOT NULL,
7758
6284
j INT NOT NULL) ENGINE = 'MYISAM' ;
7761
6287
[expecting slave to replicate correctly]
7762
6288
INSERT INTO t1 VALUES (1, "", 1);
7763
6289
INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
7764
@@ -483,10 +485,7 @@
6290
@@ -475,13 +477,7 @@
7765
6291
INSERT INTO t2 VALUES (1, "", 1);
7766
6292
INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
7767
Comparing tables master:test.t2 and slave:test.t2
6293
include/diff_tables.inc [master:t2, slave:t2]
7768
6294
-[expecting slave to stop]
7769
6295
-INSERT INTO t3 VALUES (1, "", 1);
7770
6296
-INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
7771
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
7772
+SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
7773
RESET MASTER;
7774
STOP SLAVE;
7775
RESET SLAVE;
7776
@@ -498,7 +497,7 @@
6297
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
6298
call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
6299
-include/wait_for_slave_sql_error.inc [errno=1535]
6300
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.'
6301
include/rpl_reset.inc
6302
[expecting slave to replicate correctly]
6303
INSERT INTO t4 VALUES (1, "", 1);
6304
@@ -490,14 +486,14 @@
7777
6305
[expecting slave to stop]
7778
6306
INSERT INTO t5 VALUES (1, "", 1);
7779
6307
INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
7780
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
7781
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)'
7782
RESET MASTER;
7783
STOP SLAVE;
7784
RESET SLAVE;
7785
@@ -506,7 +505,7 @@
6308
-include/wait_for_slave_sql_error.inc [errno=1535]
6309
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.'
6310
+include/wait_for_slave_sql_error.inc [errno=1677 ]
6311
+Last_SQL_Error = 'Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)''
6312
include/rpl_reset.inc
7786
6313
[expecting slave to stop]
7787
6314
INSERT INTO t6 VALUES (1, "", 1);
7788
6315
INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
7789
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
7790
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)'
7791
RESET MASTER;
7792
STOP SLAVE;
7793
RESET SLAVE;
6316
-include/wait_for_slave_sql_error.inc [errno=1535]
6317
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.'
6318
+include/wait_for_slave_sql_error.inc [errno=1677 ]
6319
+Last_SQL_Error = 'Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)''
6320
include/rpl_reset.inc
6321
[expecting slave to replicate correctly]
6322
INSERT INTO t7 VALUES (1, "", 1);
7794
6323
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
7795
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result 2011-06-15 18:45:27.610741675 +0300
7796
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result 2011-06-15 18:45:39.001364930 +0300
7797
@@ -354,6 +354,8 @@
6324
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result 2011-04-12 15:39:51.000000000 +0300
6325
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result 2011-06-16 00:55:36.150403623 +0300
6326
@@ -350,6 +350,8 @@
7798
6327
X Q 5 7 R 49 X Z 2 S 2
7799
6328
X Q 5 9 R 81 X Y 2 S 1
7800
6329
X Q 5 9 R 81 X Z 2 S 2
7803
6332
CREATE TABLE t4 (C1 CHAR(1) PRIMARY KEY, B1 BIT(1), B2 BIT(1) NOT NULL DEFAULT 0, C2 CHAR(1) NOT NULL DEFAULT 'A') ENGINE = 'INNODB' ;
7804
6333
INSERT INTO t4 SET C1 = 1;
7805
6334
SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
7806
@@ -362,6 +364,7 @@
6335
@@ -358,6 +360,7 @@
7807
6336
SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
7808
6337
C1 HEX(B1) HEX(B2)
7809
6338
1 NULL 0
7811
6340
CREATE TABLE t7 (C1 INT PRIMARY KEY, C2 INT) ENGINE = 'INNODB' ;
7812
6341
--- on slave: original values ---
7813
6342
INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
7814
@@ -475,6 +478,8 @@
6343
@@ -467,6 +470,8 @@
7815
6344
CREATE TABLE t7 (i INT NOT NULL,
7816
6345
c CHAR(255) CHARACTER SET utf8 NOT NULL,
7817
6346
j INT NOT NULL) ENGINE = 'INNODB' ;
7820
6349
[expecting slave to replicate correctly]
7821
6350
INSERT INTO t1 VALUES (1, "", 1);
7822
6351
INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
7823
@@ -483,10 +488,7 @@
6352
@@ -475,13 +480,7 @@
7824
6353
INSERT INTO t2 VALUES (1, "", 1);
7825
6354
INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
7826
Comparing tables master:test.t2 and slave:test.t2
6355
include/diff_tables.inc [master:t2, slave:t2]
7827
6356
-[expecting slave to stop]
7828
6357
-INSERT INTO t3 VALUES (1, "", 1);
7829
6358
-INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
7830
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
7831
+SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
7832
RESET MASTER;
7833
STOP SLAVE;
7834
RESET SLAVE;
7835
@@ -498,7 +500,7 @@
6359
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
6360
call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
6361
-include/wait_for_slave_sql_error.inc [errno=1535]
6362
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.'
6363
include/rpl_reset.inc
6364
[expecting slave to replicate correctly]
6365
INSERT INTO t4 VALUES (1, "", 1);
6366
@@ -490,14 +489,14 @@
7836
6367
[expecting slave to stop]
7837
6368
INSERT INTO t5 VALUES (1, "", 1);
7838
6369
INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
7839
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
7840
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)'
7841
RESET MASTER;
7842
STOP SLAVE;
7843
RESET SLAVE;
7844
@@ -506,7 +508,7 @@
6370
-include/wait_for_slave_sql_error.inc [errno=1535]
6371
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.'
6372
+include/wait_for_slave_sql_error.inc [errno=1677 ]
6373
+Last_SQL_Error = 'Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)''
6374
include/rpl_reset.inc
7845
6375
[expecting slave to stop]
7846
6376
INSERT INTO t6 VALUES (1, "", 1);
7847
6377
INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
7848
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
7849
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)'
7850
RESET MASTER;
7851
STOP SLAVE;
7852
RESET SLAVE;
7853
@@ -593,6 +595,8 @@
6378
-include/wait_for_slave_sql_error.inc [errno=1535]
6379
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.'
6380
+include/wait_for_slave_sql_error.inc [errno=1677 ]
6381
+Last_SQL_Error = 'Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)''
6382
include/rpl_reset.inc
6383
[expecting slave to replicate correctly]
6384
INSERT INTO t7 VALUES (1, "", 1);
6385
@@ -581,6 +580,8 @@
7854
6386
UPDATE t1 SET a = 8 WHERE a < 5;
7855
Comparing tables master:test.t1 and slave:test.t1
6387
include/diff_tables.inc [master:t1, slave:t1]
7856
6388
drop table t1;
7857
6389
+SET @saved_slave_type_conversions = @@SLAVE_TYPE_CONVERSIONS;
7858
6390
+SET GLOBAL SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY';
7859
6391
CREATE TABLE t1 (a bit) ENGINE='INNODB' ;
7860
6392
INSERT IGNORE INTO t1 VALUES (NULL);
7861
6393
INSERT INTO t1 ( a ) VALUES ( 0 );
7862
@@ -633,5 +637,6 @@
6394
@@ -621,6 +622,7 @@
7863
6395
UPDATE t1 SET a = 8 WHERE a = 5 LIMIT 2;
7864
6396
INSERT INTO t1 ( a ) VALUES ( 1 );
7865
6397
UPDATE t1 SET a = 9 WHERE a < 5 LIMIT 3;
7866
6398
+SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
7867
Comparing tables master:test.t1 and slave:test.t1
6399
include/diff_tables.inc [master:t1, slave:t1]
7868
6400
drop table t1;
6401
include/rpl_end.inc
7869
6402
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_colSize.result b/mysql-test/suite/rpl/r/rpl_row_colSize.result
7870
--- a/mysql-test/suite/rpl/r/rpl_row_colSize.result 2011-06-15 18:45:27.604741874 +0300
7871
+++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result 2011-06-15 18:45:38.996365093 +0300
7872
@@ -18,7 +18,7 @@
7873
RESET MASTER;
7874
INSERT INTO t1 VALUES (901251.90125);
7875
START SLAVE;
7876
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
7877
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
7878
SELECT COUNT(*) FROM t1;
7879
COUNT(*)
7880
0
7881
@@ -34,7 +34,7 @@
7882
RESET MASTER;
7883
INSERT INTO t1 VALUES (901251.90125);
7884
START SLAVE;
7885
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 12, test.t1 on slave has size 12. Master's column size should be <= the slave's column size.
7886
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'decimal(27,18)' to type 'decimal(27,9)'
7887
SELECT COUNT(*) FROM t1;
7888
COUNT(*)
7889
0
7890
@@ -50,7 +50,7 @@
7891
RESET MASTER;
7892
INSERT INTO t1 VALUES (901251.90125);
7893
START SLAVE;
7894
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
7895
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
7896
SELECT COUNT(*) FROM t1;
7897
COUNT(*)
7898
0
7899
@@ -67,7 +67,7 @@
7900
RESET MASTER;
7901
INSERT INTO t1 VALUES (901251.90125);
7902
START SLAVE;
7903
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 5, test.t1 has type 4
7904
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'double' to type 'float'
7905
SELECT COUNT(*) FROM t1;
7906
COUNT(*)
7907
0
7908
@@ -84,7 +84,7 @@
7909
RESET MASTER;
7910
INSERT INTO t1 VALUES (B'10101');
7911
START SLAVE;
7912
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 8, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
7913
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'bit(64)' to type 'bit(5)'
7914
SELECT COUNT(*) FROM t1;
7915
COUNT(*)
7916
0
7917
@@ -100,7 +100,7 @@
7918
RESET MASTER;
7919
INSERT INTO t1 VALUES (B'10101');
7920
START SLAVE;
7921
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 2. Master's column size should be <= the slave's column size.
7922
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'bit(12)' to type 'bit(11)'
7923
SELECT COUNT(*) FROM t1;
7924
COUNT(*)
7925
0
7926
@@ -117,7 +117,7 @@
6403
--- a/mysql-test/suite/rpl/r/rpl_row_colSize.result 2011-04-12 15:39:51.000000000 +0300
6404
+++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result 2011-06-16 00:55:36.154403486 +0300
6405
@@ -14,8 +14,8 @@
6406
RESET MASTER;
6407
INSERT INTO t1 VALUES (901251.90125);
6408
START SLAVE;
6409
-include/wait_for_slave_sql_error.inc [errno=1535]
6410
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.'
6411
+include/wait_for_slave_sql_error.inc [errno=1677]
6412
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)''
6413
SELECT COUNT(*) FROM t1;
6414
COUNT(*)
6415
0
6416
@@ -31,8 +31,8 @@
6417
RESET MASTER;
6418
INSERT INTO t1 VALUES (901251.90125);
6419
START SLAVE;
6420
-include/wait_for_slave_sql_error.inc [errno=1535]
6421
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 12, test.t1 on slave has size 12. Master's column size should be <= the slave's column size.'
6422
+include/wait_for_slave_sql_error.inc [errno=1677]
6423
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'decimal(27,18)' to type 'decimal(27,9)''
6424
SELECT COUNT(*) FROM t1;
6425
COUNT(*)
6426
0
6427
@@ -48,8 +48,8 @@
6428
RESET MASTER;
6429
INSERT INTO t1 VALUES (901251.90125);
6430
START SLAVE;
6431
-include/wait_for_slave_sql_error.inc [errno=1535]
6432
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.'
6433
+include/wait_for_slave_sql_error.inc [errno=1677]
6434
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)''
6435
SELECT COUNT(*) FROM t1;
6436
COUNT(*)
6437
0
6438
@@ -66,8 +66,8 @@
6439
RESET MASTER;
6440
INSERT INTO t1 VALUES (901251.90125);
6441
START SLAVE;
6442
-include/wait_for_slave_sql_error.inc [errno=1535]
6443
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 type mismatch - received type 5, test.t1 has type 4'
6444
+include/wait_for_slave_sql_error.inc [errno=1677]
6445
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'double' to type 'float''
6446
SELECT COUNT(*) FROM t1;
6447
COUNT(*)
6448
0
6449
@@ -84,8 +84,8 @@
6450
RESET MASTER;
6451
INSERT INTO t1 VALUES (B'10101');
6452
START SLAVE;
6453
-include/wait_for_slave_sql_error.inc [errno=1535]
6454
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 8, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.'
6455
+include/wait_for_slave_sql_error.inc [errno=1677]
6456
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'bit(64)' to type 'bit(5)''
6457
SELECT COUNT(*) FROM t1;
6458
COUNT(*)
6459
0
6460
@@ -101,8 +101,8 @@
6461
RESET MASTER;
6462
INSERT INTO t1 VALUES (B'10101');
6463
START SLAVE;
6464
-include/wait_for_slave_sql_error.inc [errno=1535]
6465
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 2. Master's column size should be <= the slave's column size.'
6466
+include/wait_for_slave_sql_error.inc [errno=1677]
6467
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'bit(12)' to type 'bit(11)''
6468
SELECT COUNT(*) FROM t1;
6469
COUNT(*)
6470
0
6471
@@ -119,8 +119,8 @@
7927
6472
RESET MASTER;
7928
6473
INSERT INTO t1 VALUES ('4');
7929
6474
START SLAVE;
7930
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
7931
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'set' to type 'set('4')'
6475
-include/wait_for_slave_sql_error.inc [errno=1535]
6476
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.'
6477
+include/wait_for_slave_sql_error.inc [errno=1677]
6478
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'set' to type 'set('4')''
7932
6479
SELECT COUNT(*) FROM t1;
7933
6480
COUNT(*)
7934
6481
0
7935
@@ -134,7 +134,7 @@
6482
@@ -137,8 +137,8 @@
7936
6483
RESET MASTER;
7937
6484
INSERT INTO t1 VALUES ('This is a test.');
7938
6485
START SLAVE;
7939
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 20, test.t1 on slave has size 11. Master's column size should be <= the slave's column size.
7940
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'char(20)' to type 'char(10)'
6486
-include/wait_for_slave_sql_error.inc [errno=1535]
6487
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 20, test.t1 on slave has size 11. Master's column size should be <= the slave's column size.'
6488
+include/wait_for_slave_sql_error.inc [errno=1677]
6489
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'char(20)' to type 'char(10)''
7941
6490
SELECT COUNT(*) FROM t1;
7942
6491
COUNT(*)
7943
6492
0
7944
@@ -182,7 +182,7 @@
6493
@@ -186,8 +186,8 @@
7945
6494
RESET MASTER;
7946
6495
INSERT INTO t1 VALUES ('44');
7947
6496
START SLAVE;
7948
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
7949
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'enum' to type 'enum('44','54')'
7950
SELECT COUNT(*) FROM t1;
7951
COUNT(*)
7952
0
7953
@@ -199,7 +199,7 @@
7954
RESET MASTER;
7955
INSERT INTO t1 VALUES ('This is a test.');
7956
START SLAVE;
7957
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 100. Master's column size should be <= the slave's column size.
7958
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(100)'
7959
SELECT COUNT(*) FROM t1;
7960
COUNT(*)
7961
0
7962
@@ -215,7 +215,7 @@
7963
RESET MASTER;
7964
INSERT INTO t1 VALUES ('This is a test.');
7965
START SLAVE;
7966
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 200, test.t1 on slave has size 10. Master's column size should be <= the slave's column size.
7967
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'varchar(200)' to type 'varchar(10)'
7968
SELECT COUNT(*) FROM t1;
7969
COUNT(*)
7970
0
7971
@@ -231,7 +231,7 @@
7972
RESET MASTER;
7973
INSERT INTO t1 VALUES ('This is a test.');
7974
START SLAVE;
7975
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 1000. Master's column size should be <= the slave's column size.
7976
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(1000)'
7977
SELECT COUNT(*) FROM t1;
7978
COUNT(*)
7979
0
7980
@@ -248,7 +248,7 @@
7981
RESET MASTER;
7982
INSERT INTO t1 VALUES ('This is a test.');
7983
START SLAVE;
7984
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 4, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
7985
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob'
6497
-include/wait_for_slave_sql_error.inc [errno=1535]
6498
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.'
6499
+include/wait_for_slave_sql_error.inc [errno=1677]
6500
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'enum' to type 'enum('44','54')''
6501
SELECT COUNT(*) FROM t1;
6502
COUNT(*)
6503
0
6504
@@ -204,8 +204,8 @@
6505
RESET MASTER;
6506
INSERT INTO t1 VALUES ('This is a test.');
6507
START SLAVE;
6508
-include/wait_for_slave_sql_error.inc [errno=1535]
6509
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 100. Master's column size should be <= the slave's column size.'
6510
+include/wait_for_slave_sql_error.inc [errno=1677]
6511
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(100)''
6512
SELECT COUNT(*) FROM t1;
6513
COUNT(*)
6514
0
6515
@@ -221,8 +221,8 @@
6516
RESET MASTER;
6517
INSERT INTO t1 VALUES ('This is a test.');
6518
START SLAVE;
6519
-include/wait_for_slave_sql_error.inc [errno=1535]
6520
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 200, test.t1 on slave has size 10. Master's column size should be <= the slave's column size.'
6521
+include/wait_for_slave_sql_error.inc [errno=1677]
6522
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'varchar(200)' to type 'varchar(10)''
6523
SELECT COUNT(*) FROM t1;
6524
COUNT(*)
6525
0
6526
@@ -238,8 +238,8 @@
6527
RESET MASTER;
6528
INSERT INTO t1 VALUES ('This is a test.');
6529
START SLAVE;
6530
-include/wait_for_slave_sql_error.inc [errno=1535]
6531
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 1000. Master's column size should be <= the slave's column size.'
6532
+include/wait_for_slave_sql_error.inc [errno=1677]
6533
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(1000)''
6534
SELECT COUNT(*) FROM t1;
6535
COUNT(*)
6536
0
6537
@@ -256,8 +256,8 @@
6538
RESET MASTER;
6539
INSERT INTO t1 VALUES ('This is a test.');
6540
START SLAVE;
6541
-include/wait_for_slave_sql_error.inc [errno=1535]
6542
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 size mismatch - master has size 4, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.'
6543
+include/wait_for_slave_sql_error.inc [errno=1677]
6544
+Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob''
7986
6545
SELECT COUNT(*) FROM t1;
7987
6546
COUNT(*)
7988
6547
0
7989
6548
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_conflicts.result b/mysql-test/suite/rpl/r/rpl_row_conflicts.result
7990
--- a/mysql-test/suite/rpl/r/rpl_row_conflicts.result 2011-06-15 18:45:27.602741939 +0300
7991
+++ b/mysql-test/suite/rpl/r/rpl_row_conflicts.result 2011-06-15 18:45:38.994365162 +0300
7992
@@ -24,7 +24,7 @@
7993
1
6549
--- a/mysql-test/suite/rpl/r/rpl_row_conflicts.result 2011-04-12 15:39:51.000000000 +0300
6550
+++ b/mysql-test/suite/rpl/r/rpl_row_conflicts.result 2011-06-16 00:55:36.155403452 +0300
6551
@@ -21,7 +21,7 @@
7994
6552
[on slave]
7995
6553
---- Wait until slave stops with an error ----
6554
include/wait_for_slave_sql_error.inc [errno=1062]
7996
6555
-Last_SQL_Error = Could not execute Write_rows event on table test.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY; the event's master log master-bin.000001, end_log_pos 346 (expected "duplicate key" error)
7997
6556
+Last_SQL_Error = Could not execute Write_rows event on table test.t1; Duplicate entry '1' for key 'PRIMARY', Error_code: 1062; handler error HA_ERR_FOUND_DUPP_KEY; the event's master log master-bin.000001, end_log_pos 480 (expected "duplicate key" error)
7998
SELECT * FROM t1;
7999
a
8000
1
8001
@@ -50,7 +50,7 @@
8002
a
8003
[on slave]
8004
---- Wait until slave stops with an error ----
8005
-Last_SQL_Error = Could not execute Delete_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_KEY_NOT_FOUND; the event's master log master-bin.000001, end_log_pos 982 (expected "can't find record" error)
8006
+Last_SQL_Error = Could not execute Delete_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_KEY_NOT_FOUND; the event's master log master-bin.000001, end_log_pos 1116 (expected "can't find record" error)
8007
SELECT * FROM t1;
8008
a
8009
---- Resolve the conflict on the slave and restart SQL thread ----
6557
call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.* Error_code: 1062");
6558
SELECT * FROM t1;
6559
a
8010
6560
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
8011
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2011-06-15 18:45:27.595742171 +0300
8012
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2011-06-15 18:45:38.988365358 +0300
8013
@@ -122,19 +122,19 @@
6561
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2011-04-12 15:39:53.000000000 +0300
6562
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2011-06-16 00:55:36.156403417 +0300
6563
@@ -117,17 +117,17 @@
6564
include/check_slave_is_running.inc
8014
6565
INSERT INTO t9 VALUES (4);
8015
6566
INSERT INTO t4 VALUES (4);
8016
--source include/wait_for_slave_sql_error_and_skip.inc
8017
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4
8018
+Last_SQL_Error = Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float'
8019
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
8020
include/start_slave.inc
6567
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535");
6568
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6569
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4'
6570
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
6571
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6572
+Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float''
8021
6573
INSERT INTO t9 VALUES (5);
8022
6574
INSERT INTO t5 VALUES (5,10,25);
8023
--source include/wait_for_slave_sql_error_and_skip.inc
8024
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4
8025
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'int' to type 'float'
8026
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
8027
include/start_slave.inc
6575
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6576
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4'
6577
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6578
+Last_SQL_Error = 'Column 1 of table 'test.t5' cannot be converted from type 'int' to type 'float''
8028
6579
INSERT INTO t9 VALUES (6);
8029
6580
INSERT INTO t6 VALUES (6,12,36);
8030
--source include/wait_for_slave_sql_error_and_skip.inc
8031
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4
8032
+Last_SQL_Error = Column 2 of table 'test.t6' cannot be converted from type 'int' to type 'float'
8033
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
8034
include/start_slave.inc
6581
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6582
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4'
6583
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6584
+Last_SQL_Error = 'Column 2 of table 'test.t6' cannot be converted from type 'int' to type 'float''
8035
6585
INSERT INTO t9 VALUES (6);
6586
include/check_slave_is_running.inc
6587
INSERT INTO t7 VALUES (1),(2),(3);
8036
6588
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
8037
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2011-06-15 18:45:27.593742237 +0300
8038
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2011-06-15 18:45:38.987365393 +0300
8039
@@ -122,19 +122,19 @@
6589
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2011-04-12 15:39:53.000000000 +0300
6590
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2011-06-16 00:55:36.157403383 +0300
6591
@@ -117,17 +117,17 @@
6592
include/check_slave_is_running.inc
8040
6593
INSERT INTO t9 VALUES (4);
8041
6594
INSERT INTO t4 VALUES (4);
8042
--source include/wait_for_slave_sql_error_and_skip.inc
8043
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4
8044
+Last_SQL_Error = Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float'
8045
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
8046
include/start_slave.inc
6595
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column [012] type mismatch.* Error_code: 1535");
6596
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6597
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4'
6598
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
6599
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6600
+Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float''
8047
6601
INSERT INTO t9 VALUES (5);
8048
6602
INSERT INTO t5 VALUES (5,10,25);
8049
--source include/wait_for_slave_sql_error_and_skip.inc
8050
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4
8051
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'int' to type 'float'
8052
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
8053
include/start_slave.inc
6603
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6604
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4'
6605
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6606
+Last_SQL_Error = 'Column 1 of table 'test.t5' cannot be converted from type 'int' to type 'float''
8054
6607
INSERT INTO t9 VALUES (6);
8055
6608
INSERT INTO t6 VALUES (6,12,36);
8056
--source include/wait_for_slave_sql_error_and_skip.inc
8057
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4
8058
+Last_SQL_Error = Column 2 of table 'test.t6' cannot be converted from type 'int' to type 'float'
8059
SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
8060
include/start_slave.inc
6609
-include/wait_for_slave_sql_error_and_skip.inc [errno=1535]
6610
-Last_SQL_Error = 'Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4'
6611
+include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
6612
+Last_SQL_Error = 'Column 2 of table 'test.t6' cannot be converted from type 'int' to type 'float''
8061
6613
INSERT INTO t9 VALUES (6);
6614
include/check_slave_is_running.inc
6615
INSERT INTO t7 VALUES (1),(2),(3);
8062
6616
diff -ruN a/mysql-test/suite/rpl/r/rpl_typeconv.result b/mysql-test/suite/rpl/r/rpl_typeconv.result
8063
6617
--- a/mysql-test/suite/rpl/r/rpl_typeconv.result 1970-01-01 03:00:00.000000000 +0300
8064
+++ b/mysql-test/suite/rpl/r/rpl_typeconv.result 2011-06-15 18:45:39.005364795 +0300
8065
@@ -0,0 +1,558 @@
8066
+stop slave;
8067
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
8068
+reset master;
8069
+reset slave;
8070
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
8071
+start slave;
6618
+++ b/mysql-test/suite/rpl/r/rpl_typeconv.result 2011-06-16 00:55:36.159403314 +0300
6619
@@ -0,0 +1,539 @@
6620
+include/master-slave.inc
6621
+[connection master]
8072
6622
+set @saved_slave_type_conversions = @@global.slave_type_conversions;
8073
6623
+CREATE TABLE type_conversions (
8074
6624
+TestNo INT AUTO_INCREMENT PRIMARY KEY,
8106
6656
+ALL_LOSSY,ALL_NON_LOSSY
8107
6657
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='';
8108
6658
+**** Running tests with @@SLAVE_TYPE_CONVERSIONS = '' ****
8109
+**** Resetting master and slave ****
8110
+include/stop_slave.inc
8111
+RESET SLAVE;
8112
+RESET MASTER;
8113
+include/start_slave.inc
6659
+include/rpl_reset.inc
8114
6660
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY';
8115
6661
+**** Running tests with @@SLAVE_TYPE_CONVERSIONS = 'ALL_NON_LOSSY' ****
8116
+**** Resetting master and slave ****
8117
+include/stop_slave.inc
8118
+RESET SLAVE;
8119
+RESET MASTER;
8120
+include/start_slave.inc
6662
+include/rpl_reset.inc
8121
6663
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY';
8122
6664
+**** Running tests with @@SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY' ****
8123
+**** Resetting master and slave ****
8124
+include/stop_slave.inc
8125
+RESET SLAVE;
8126
+RESET MASTER;
8127
+include/start_slave.inc
6665
+include/rpl_reset.inc
8128
6666
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY';
8129
6667
+**** Running tests with @@SLAVE_TYPE_CONVERSIONS = 'ALL_LOSSY,ALL_NON_LOSSY' ****
8130
+**** Resetting master and slave ****
8131
+include/stop_slave.inc
8132
+RESET SLAVE;
8133
+RESET MASTER;
8134
+include/start_slave.inc
6668
+include/rpl_reset.inc
8135
6669
+**** Result of conversions ****
8136
6670
+Source_Type Target_Type All_Type_Conversion_Flags Value_On_Slave
8137
6671
+TINYBLOB TINYBLOB <Correct value>
8621
7155
+DROP TABLE type_conversions;
8622
7156
+DROP TABLE t1;
8623
7157
+set global slave_type_conversions = @saved_slave_type_conversions;
7158
+include/rpl_end.inc
8624
7159
diff -ruN a/mysql-test/suite/rpl/t/percona_mixed_binlog_direct.test b/mysql-test/suite/rpl/t/percona_mixed_binlog_direct.test
8625
7160
--- a/mysql-test/suite/rpl/t/percona_mixed_binlog_direct.test 1970-01-01 03:00:00.000000000 +0300
8626
+++ b/mysql-test/suite/rpl/t/percona_mixed_binlog_direct.test 2011-06-15 18:45:38.967366053 +0300
8627
@@ -0,0 +1,247 @@
7161
+++ b/mysql-test/suite/rpl/t/percona_mixed_binlog_direct.test 2011-06-16 00:55:36.161403245 +0300
7162
@@ -0,0 +1,248 @@
8628
7163
+################################################################################
8629
7164
+# This test case checks if the option "binlog-direct-non-transactional-updates"
8630
7165
+# makes non-transactional changes in the row-based format to be written to the
8872
7407
+--echo #########################################################################
8873
7408
+SET @commands= 'clean';
8874
7409
+--source extra/rpl_tests/rpl_mixing_engines.inc
7410
+--source include/rpl_end.inc
8875
7411
diff -ruN a/mysql-test/suite/rpl/t/percona_row_binlog_direct.test b/mysql-test/suite/rpl/t/percona_row_binlog_direct.test
8876
7412
--- a/mysql-test/suite/rpl/t/percona_row_binlog_direct.test 1970-01-01 03:00:00.000000000 +0300
8877
+++ b/mysql-test/suite/rpl/t/percona_row_binlog_direct.test 2011-06-15 18:45:38.979365656 +0300
8878
@@ -0,0 +1,236 @@
7413
+++ b/mysql-test/suite/rpl/t/percona_row_binlog_direct.test 2011-06-16 00:55:36.162403211 +0300
7414
@@ -0,0 +1,237 @@
8879
7415
+################################################################################
8880
7416
+# This test case checks if the option "binlog-direct-non-transactional-updates"
8881
7417
+# makes non-transactional changes in the row-based format to be written to the
9112
7648
+--echo #########################################################################
9113
7649
+SET @commands= 'clean';
9114
7650
+--source extra/rpl_tests/rpl_mixing_engines.inc
7651
+--source include/rpl_end.inc
9115
7652
diff -ruN a/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-master.opt b/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-master.opt
9116
7653
--- a/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-master.opt 1970-01-01 03:00:00.000000000 +0300
9117
+++ b/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-master.opt 2011-06-15 18:45:38.972365888 +0300
7654
+++ b/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-master.opt 2011-06-16 00:55:36.162403211 +0300
9118
7655
@@ -0,0 +1 @@
9119
7656
+--max_allowed_packet=1024 --net_buffer_length=1024
9120
7657
diff -ruN a/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-slave.opt b/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-slave.opt
9121
7658
--- a/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-slave.opt 1970-01-01 03:00:00.000000000 +0300
9122
+++ b/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-slave.opt 2011-06-15 18:45:38.969365985 +0300
7659
+++ b/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet-slave.opt 2011-06-16 00:55:36.163403177 +0300
9123
7660
@@ -0,0 +1 @@
9124
7661
+--max_allowed_packet=1024 --net_buffer_length=1024
9125
7662
diff -ruN a/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet.test b/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet.test
9126
7663
--- a/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet.test 1970-01-01 03:00:00.000000000 +0300
9127
+++ b/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet.test 2011-06-15 18:45:38.983365523 +0300
7664
+++ b/mysql-test/suite/rpl/t/percona_rpl_max_binlog_packet.test 2011-06-16 00:55:36.164403142 +0300
9128
7665
@@ -0,0 +1,172 @@
9129
7666
+########################################################################
9130
7667
+# Test the max_binlog_packet server variable.
9299
7836
+--sync_with_master
9300
7837
+
9301
7838
diff -ruN a/mysql-test/suite/rpl/t/rpl_bug31076.test b/mysql-test/suite/rpl/t/rpl_bug31076.test
9302
--- a/mysql-test/suite/rpl/t/rpl_bug31076.test 2011-06-15 18:45:27.569743031 +0300
9303
+++ b/mysql-test/suite/rpl/t/rpl_bug31076.test 2011-06-15 18:45:38.963366183 +0300
7839
--- a/mysql-test/suite/rpl/t/rpl_bug31076.test 2011-04-12 15:39:58.000000000 +0300
7840
+++ b/mysql-test/suite/rpl/t/rpl_bug31076.test 2011-06-16 00:55:36.165403108 +0300
9304
7841
@@ -1,5 +1,8 @@
9305
7842
source include/master-slave.inc;
9306
7843
9310
7847
CREATE DATABASE track;
9311
7848
USE track;
9312
7849
9313
@@ -130,7 +133,10 @@
7850
@@ -130,8 +133,11 @@
9314
7851
SELECT * FROM visits;
9315
7852
SELECT * FROM visits_events;
9316
7853
9321
7858
sync_slave_with_master;
9322
7859
+
9323
7860
--echo End of 5.1 tests
7861
--source include/rpl_end.inc
9324
7862
diff -ruN a/mysql-test/suite/rpl/t/rpl_colSize.test b/mysql-test/suite/rpl/t/rpl_colSize.test
9325
--- a/mysql-test/suite/rpl/t/rpl_colSize.test 2011-06-15 18:45:27.575742832 +0300
9326
+++ b/mysql-test/suite/rpl/t/rpl_colSize.test 2011-06-15 18:45:38.969365985 +0300
7863
--- a/mysql-test/suite/rpl/t/rpl_colSize.test 2011-04-12 15:39:59.000000000 +0300
7864
+++ b/mysql-test/suite/rpl/t/rpl_colSize.test 2011-06-16 00:55:36.166403074 +0300
9327
7865
@@ -18,6 +18,9 @@
9328
7866
STOP SLAVE;
9329
7867
RESET SLAVE;
9334
7872
eval CREATE TABLE t1 (
9335
7873
a float (47),
9336
7874
b double (143,9),
9337
@@ -217,4 +220,6 @@
7875
@@ -217,5 +220,7 @@
9338
7876
DROP TABLE t1;
9339
7877
sync_slave_with_master;
9340
7878
9341
7879
+SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
9342
7880
+
9343
7881
# END 5.1 Test Case
7882
--source include/rpl_end.inc
9344
7883
diff -ruN a/mysql-test/suite/rpl/t/rpl_row_annotate_dont-slave.opt b/mysql-test/suite/rpl/t/rpl_row_annotate_dont-slave.opt
9345
7884
--- a/mysql-test/suite/rpl/t/rpl_row_annotate_dont-slave.opt 1970-01-01 03:00:00.000000000 +0300
9346
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont-slave.opt 2011-06-15 18:45:38.968366019 +0300
7885
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont-slave.opt 2011-06-16 00:55:36.166403074 +0300
9347
7886
@@ -0,0 +1 @@
9348
7887
+--log-slave-updates --replicate-ignore-table=test1.xt1 --replicate-ignore-table=test1.xt2
9349
7888
\ No newline at end of file
9350
7889
diff -ruN a/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test b/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test
9351
7890
--- a/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test 1970-01-01 03:00:00.000000000 +0300
9352
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test 2011-06-15 18:45:38.961366251 +0300
7891
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test 2011-06-16 00:55:36.167403039 +0300
9353
7892
@@ -0,0 +1,9 @@
9354
7893
+###############################################################################
9355
7894
+# WL47: Store in binlog text of statements that caused RBR events
9362
7901
+--source extra/rpl_tests/rpl_row_annotate.test
9363
7902
diff -ruN a/mysql-test/suite/rpl/t/rpl_row_annotate_do-slave.opt b/mysql-test/suite/rpl/t/rpl_row_annotate_do-slave.opt
9364
7903
--- a/mysql-test/suite/rpl/t/rpl_row_annotate_do-slave.opt 1970-01-01 03:00:00.000000000 +0300
9365
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do-slave.opt 2011-06-15 18:45:38.983365523 +0300
7904
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do-slave.opt 2011-06-16 00:55:36.168403005 +0300
9366
7905
@@ -0,0 +1 @@
9367
7906
+--log-slave-updates --replicate-annotate-rows-events --replicate-ignore-table=test1.xt1 --replicate-ignore-table=test1.xt2
9368
7907
\ No newline at end of file
9369
7908
diff -ruN a/mysql-test/suite/rpl/t/rpl_row_annotate_do.test b/mysql-test/suite/rpl/t/rpl_row_annotate_do.test
9370
7909
--- a/mysql-test/suite/rpl/t/rpl_row_annotate_do.test 1970-01-01 03:00:00.000000000 +0300
9371
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do.test 2011-06-15 18:45:38.963366183 +0300
7910
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do.test 2011-06-16 00:55:36.168403005 +0300
9372
7911
@@ -0,0 +1,16 @@
9373
7912
+###############################################################################
9374
7913
+# WL47: Store in binlog text of statements that caused RBR events
9387
7926
+--source include/have_binlog_format_row.inc
9388
7927
+--source extra/rpl_tests/rpl_row_annotate.test
9389
7928
diff -ruN a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
9390
--- a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test 2011-06-15 18:45:27.566743130 +0300
9391
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test 2011-06-15 18:45:38.960366286 +0300
7929
--- a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test 2011-04-12 15:40:15.000000000 +0300
7930
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test 2011-06-16 00:55:36.169402971 +0300
9392
7931
@@ -2,6 +2,8 @@
9393
7932
-- source include/have_binlog_format_row.inc
9394
7933
-- source include/master-slave.inc
9398
7937
let $type= 'INNODB' ;
9399
7938
let $extra_index= ;
9400
7939
-- source extra/rpl_tests/rpl_row_basic.test
7940
diff -ruN a/mysql-test/suite/rpl/t/rpl_row_colSize.test b/mysql-test/suite/rpl/t/rpl_row_colSize.test
7941
--- a/mysql-test/suite/rpl/t/rpl_row_colSize.test 2011-04-12 15:40:15.000000000 +0300
7942
+++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test 2011-06-16 00:55:36.170402936 +0300
7943
@@ -9,6 +9,10 @@
7944
-- source include/master-slave.inc
7945
-- source include/have_binlog_format_row.inc
7946
7947
+--disable_query_log
7948
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
7949
+--enable_query_log
7950
+
7951
--disable_warnings
7952
DROP TABLE IF EXISTS t1;
7953
--enable_warnings
9401
7954
diff -ruN a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
9402
--- a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test 2011-06-15 18:45:27.581742634 +0300
9403
+++ b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test 2011-06-15 18:45:38.975365788 +0300
7955
--- a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test 2011-04-12 15:40:16.000000000 +0300
7956
+++ b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test 2011-06-16 00:55:36.170402936 +0300
9404
7957
@@ -1,7 +1,8 @@
9405
7958
# depends on the binlog output
9406
7959
-- source include/have_binlog_format_row.inc
9412
7965
# Bug#18326: Do not lock table for writing during prepare of statement
9413
7966
# The use of the ps protocol causes extra table maps in the binlog, so
9414
7967
diff -ruN a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
9415
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2011-06-15 18:45:27.580742667 +0300
9416
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2011-06-15 18:45:38.974365821 +0300
7968
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2011-04-12 15:40:16.000000000 +0300
7969
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test 2011-06-16 00:55:36.171402901 +0300
9417
7970
@@ -162,15 +162,18 @@
9418
7971
9419
7972
remove_file $MYSQLTEST_VARDIR/tmp/master.sql;
9474
8027
# Bug#16217 (mysql client did not know how not switch its internal charset)
9475
8028
--disable_query_log
9476
8029
diff -ruN a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
9477
--- a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test 2011-06-15 18:45:27.582742601 +0300
9478
+++ b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test 2011-06-15 18:45:38.976365755 +0300
9479
@@ -1,7 +1,8 @@
8030
--- a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test 2011-04-12 15:40:20.000000000 +0300
8031
+++ b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test 2011-06-16 00:55:36.172402867 +0300
8032
@@ -1,5 +1,6 @@
9480
8033
# depends on the binlog output
9481
8034
--source include/have_binlog_format_mixed_or_statement.inc
9482
8035
+--source include/binlog_start_pos.inc
9484
8037
-let $rename_event_pos= 656;
9485
8038
+let $rename_event_pos= `select @binlog_start_pos + 550`;
9486
8039
-- source extra/rpl_tests/rpl_flsh_tbls.test
9487
9488
# End of 4.1 tests
9489
8040
diff -ruN a/mysql-test/suite/rpl/t/rpl_typeconv.test b/mysql-test/suite/rpl/t/rpl_typeconv.test
9490
8041
--- a/mysql-test/suite/rpl/t/rpl_typeconv.test 1970-01-01 03:00:00.000000000 +0300
9491
+++ b/mysql-test/suite/rpl/t/rpl_typeconv.test 2011-06-15 18:45:38.976365755 +0300
9492
@@ -0,0 +1,69 @@
8042
+++ b/mysql-test/suite/rpl/t/rpl_typeconv.test 2011-06-16 00:55:36.173402833 +0300
8043
@@ -0,0 +1,75 @@
9493
8044
+--source include/have_binlog_format_row.inc
9494
8045
+--source include/master-slave.inc
9495
8046
+
9519
8070
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY,NONEXISTING_BIT';
9520
8071
+SELECT @@global.slave_type_conversions;
9521
8072
+
8073
+# ignore error in mysqld.err
8074
+--disable_query_log
8075
+call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
8076
+--enable_query_log
8077
+
9522
8078
+# Checking strict interpretation of type conversions
9523
8079
+connection slave;
9524
8080
+SET GLOBAL SLAVE_TYPE_CONVERSIONS='';
9559
8115
+
9560
8116
+set global slave_type_conversions = @saved_slave_type_conversions;
9561
8117
+
8118
+source include/rpl_end.inc;
9562
8119
diff -ruN a/mysql-test/t/ctype_cp932_binlog_stm.test b/mysql-test/t/ctype_cp932_binlog_stm.test
9563
--- a/mysql-test/t/ctype_cp932_binlog_stm.test 2011-06-15 18:45:27.275752755 +0300
9564
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test 2011-06-15 18:45:38.672375810 +0300
9565
@@ -28,14 +28,6 @@
8120
--- a/mysql-test/t/ctype_cp932_binlog_stm.test 2011-04-12 15:37:40.000000000 +0300
8121
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test 2011-06-16 00:55:36.174402799 +0300
8122
@@ -28,16 +28,6 @@
9566
8123
9567
8124
--echo End of 5.0 tests
9568
8125
9571
8128
-# Note: 364 is a magic position (found experimentally, depends on
9572
8129
-# the log's contents) that caused the server crash.
9573
8130
-
8131
-call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49");
8132
-
9574
8133
---error 1220
9575
8134
-SHOW BINLOG EVENTS FROM 365;
9576
8135
-
9578
8137
CREATE TABLE t1 (a varchar(16)) character set cp932;
9579
8138
INSERT INTO t1 VALUES (0x8372835E),(0x8352835E);
9580
8139
diff -ruN a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test
9581
--- a/mysql-test/t/mysqlbinlog2.test 2011-06-15 18:45:27.300751928 +0300
9582
+++ b/mysql-test/t/mysqlbinlog2.test 2011-06-15 18:45:38.696375015 +0300
8140
--- a/mysql-test/t/mysqlbinlog2.test 2011-04-12 15:37:52.000000000 +0300
8141
+++ b/mysql-test/t/mysqlbinlog2.test 2011-06-16 00:55:36.177402696 +0300
9583
8142
@@ -3,7 +3,7 @@
9584
8143
9585
8144
# TODO: Need to look at making row based version once new binlog client is complete.
9668
8227
select "--- start-datetime --" as "";
9669
8228
--enable_query_log
9670
8229
diff -ruN a/mysql-test/t/mysqlbinlog-master.opt b/mysql-test/t/mysqlbinlog-master.opt
9671
--- a/mysql-test/t/mysqlbinlog-master.opt 2011-06-15 18:45:27.291752226 +0300
9672
+++ b/mysql-test/t/mysqlbinlog-master.opt 1970-01-01 03:00:00.000000000 +0300
9673
@@ -1 +0,0 @@
8230
--- a/mysql-test/t/mysqlbinlog-master.opt 2011-04-12 15:37:52.000000000 +0300
8231
+++ b/mysql-test/t/mysqlbinlog-master.opt 2011-06-16 00:55:36.178402661 +0300
8232
@@ -1,2 +1 @@
9674
8233
---max-binlog-size=4096
8234
--force-restart
9675
8235
diff -ruN a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
9676
--- a/mysql-test/t/mysqlbinlog.test 2011-06-15 18:45:27.286752391 +0300
9677
+++ b/mysql-test/t/mysqlbinlog.test 2011-06-15 18:45:38.682375478 +0300
8236
--- a/mysql-test/t/mysqlbinlog.test 2011-04-12 15:37:52.000000000 +0300
8237
+++ b/mysql-test/t/mysqlbinlog.test 2011-06-16 00:55:36.181402558 +0300
9678
8238
@@ -3,10 +3,18 @@
9679
8239
-- source include/have_binlog_format_statement.inc
9680
8240
9992
8552
eval SELECT
9993
8553
diff -ruN a/mysql-test/t/percona_fast_alter_column.test b/mysql-test/t/percona_fast_alter_column.test
9994
8554
--- a/mysql-test/t/percona_fast_alter_column.test 1970-01-01 03:00:00.000000000 +0300
9995
+++ b/mysql-test/t/percona_fast_alter_column.test 2011-06-15 18:45:38.677375644 +0300
8555
+++ b/mysql-test/t/percona_fast_alter_column.test 2011-06-16 00:55:36.182402524 +0300
9996
8556
@@ -0,0 +1,65 @@
9997
8557
+#
9998
8558
+# Tests for innodb_fast_alter_column
10061
8621
+DROP TABLE t1;
10062
8622
diff -ruN a/mysql-test/t/percona_mysqlbinlog_max_binlog_statement_size.test b/mysql-test/t/percona_mysqlbinlog_max_binlog_statement_size.test
10063
8623
--- a/mysql-test/t/percona_mysqlbinlog_max_binlog_statement_size.test 1970-01-01 03:00:00.000000000 +0300
10064
+++ b/mysql-test/t/percona_mysqlbinlog_max_binlog_statement_size.test 2011-06-15 18:45:38.692375148 +0300
8624
+++ b/mysql-test/t/percona_mysqlbinlog_max_binlog_statement_size.test 2011-06-16 00:55:36.183402490 +0300
10065
8625
@@ -0,0 +1,89 @@
10066
8626
+#
10067
8627
+# Test the mysqlbinlog's --binlog-stmt-max-size option
10154
8714
+DROP TABLE t1;
10155
8715
diff -ruN a/mysql-test/t/percona_mysqlbinlog_slave_exec_idempotent.test b/mysql-test/t/percona_mysqlbinlog_slave_exec_idempotent.test
10156
8716
--- a/mysql-test/t/percona_mysqlbinlog_slave_exec_idempotent.test 1970-01-01 03:00:00.000000000 +0300
10157
+++ b/mysql-test/t/percona_mysqlbinlog_slave_exec_idempotent.test 2011-06-15 18:45:38.711374519 +0300
8717
+++ b/mysql-test/t/percona_mysqlbinlog_slave_exec_idempotent.test 2011-06-16 00:55:36.185402420 +0300
10158
8718
@@ -0,0 +1,61 @@
10159
8719
+#
10160
8720
+# Test the mysqlbinlog's --slave-exec-idempotent option
10219
8779
+DROP TABLE t1;
10220
8780
diff -ruN a/mysql-test/t/percona_timestamp_no_default.test b/mysql-test/t/percona_timestamp_no_default.test
10221
8781
--- a/mysql-test/t/percona_timestamp_no_default.test 1970-01-01 03:00:00.000000000 +0300
10222
+++ b/mysql-test/t/percona_timestamp_no_default.test 2011-06-15 18:45:38.678375612 +0300
8782
+++ b/mysql-test/t/percona_timestamp_no_default.test 2011-06-16 00:55:36.189402283 +0300
10223
8783
@@ -0,0 +1,93 @@
10224
8784
+########################################################################
10225
8785
+# Tests for timestamp_no_default.patch
Loggerhead is a web-based interface for Breezy
Version: 2.0.1