Merge lp:~tsarev/percona-server/18205_03_wl47.patch into lp:percona-server/rnt-5.1
- 18205_03_wl47.patch
- Merge into rnt-5.1
Status: | Merged |
---|---|
Merge reported by: | Oleg Tsarev |
Merged at revision: | not available |
Proposed branch: | lp:~tsarev/percona-server/18205_03_wl47.patch |
Merge into: | lp:percona-server/rnt-5.1 |
Prerequisite: | lp:~tsarev/percona-server/18205_01_mysqlbinlog_fix.patch |
Diff against target: |
4605 lines (+2875/-1366) 2 files modified
patches/mysql-test-rnt.diff (+12/-1240) patches/wl47.patch (+2863/-126) |
To merge this branch: | bzr merge lp:~tsarev/percona-server/18205_03_wl47.patch |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Approve | ||
Oleg Tsarev | Pending | ||
Laurynas Biveinis | Pending | ||
Review via email: mp+92706@code.launchpad.net |
This proposal supersedes a proposal from 2012-02-08.
Commit message
Description of the change
move tests related to wl47.patch from mysql-test-rnt.diff to wl47.patch
fixed code policy
(issue 18205 - prepare lp:percona-server/rnt-5.1 patches to merge to lp:percona-server/5.1)
after merge this fix to lp:percona-server/rnt-5.1 I will propose for merge it to lp:percona-server/5.1
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal | # |
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal | # |
Lines 4293--4925: no need to change it.
Lines 4311--4315: likewise.
Lines 4351--4354: unmentioned functionality change?
Lines 4404--4407: no need to change it.
Lines 4374--4378: unmentioned functinality change?
Lines 4415--4440: likewise.
Lines 4448--4461: likewise.
Lines 4469--4470: no need to change it.
Lines 4478--4479: likewise.
Lines 4485--4486: I think the "before" code is actually correct. The
guidelines don't mention it, but there is an example there with it.
Lines 4587--4591: no need to change it.
Line 4617: one space after "=" (no need to align rvalues in this case)
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal | # |
> Lines 4293--4925: no need to change it.
> Lines 4311--4315: likewise.
From my point of view more readable, but ok
> Lines 4351--4354: unmentioned functionality change?
See 4346--4357
> Lines 4404--4407: no need to change it.
I aligned agument of calls for this three functions for better readability
> Lines 4374--4378: unmentioned functinality change?
This is:
#define MYSQL_CLIENT
...
#endif // removed
// removed
#define MYSQL_CLIENT // removed
....
> Lines 4415--4440: likewise.
See Lines 4351--4354 and 4448--4461
> Lines 4448--4461: likewise.
See 4427--4440
> Lines 4469--4470: no need to change it.
> Lines 4478--4479: likewise.
According to MySQL Coding Guidelines I aligned right part of assigments. Do you need exact link and quote?
Quote:
http://
When assigning to a variable, put zero spaces after the target variable name, then the assignment operator ('=' '+=' etc.), then space(s). For single assignments, there should be only one space after the equal sign. For multiple assignments, add additional spaces so that the source values line up. For example:
> Lines 4485--4486: I think the "before" code is actually correct. The
guidelines don't mention it, but there is an example there with it.
> Line 4617: one space after "=" (no need to align rvalues in this case)
Sorry, incorrectly understood part of Coding Guidelines. Will fix it.
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal | # |
Sorry, I forgot remove question about quote and link :)
Will insert link & quote later and forgot remove q
:)
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal | # |
> Sorry, I forgot remove question about quote and link :)
>
> Will insert link & quote later and forgot remove q
I inserted
>
> :)
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal | # |
Yes, you are right on aligning assignment rvalues.
I still don't follow the code changes. They are not code fixes to fix formating and they are not described in the commit.
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal | # |
> According to MySQL Coding Guidelines I aligned right part of assigments. Do you need exact link and quote?
>
> Quote:
> http://
> When assigning to a variable, put zero spaces after the target variable name, then the assignment operator ('=' '+=' etc.), then space(s). For single assignments, there should be only one space after the equal sign. For multiple assignments, add additional spaces so that the source values line up. For example:
I'm sure it's meant to be applicable only to assignments in variable declarations, as the following example confirms.
Anyway, the coding guidelines may be (and often are) outdated. If you take a look at the source code (even the most recent changes), you won't see any examples of that rule being followed, even for declarations. Which is probably a hint it's not relevant anymore.
Anyway, not rule can justify abominations like this:
> -+ m_annotate_event= event;
> ++ m_annotate_event= event;
> + sql_thd-
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal | # |
Alexey,
Fixed.
> I'm sure it's meant to be applicable only to assignments in variable declarations, as the following example confirms.
I don't sure in any things last several years.
From this point of view I am looking to formal documents to understand how I should do my work.
> Anyway, the coding guidelines may be (and often are) outdated.
This is mean, we should reflect code policy changes in formal document.
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal | # |
I still see some unnecessary alignment changes:
> -int THD::binlog_
> -+int THD::binlog_
> ++int THD::binlog_
> + my_bool *with_annotate)
and
> -+ int binlog_
> ++ int binlog_
> + my_bool *with_annotate= 0);
and
> -+ errmsg = "Failed on my_net_write()";
> ++ errmsg= "Failed on my_net_write()";
and
> -+ errmsg = "failed in send_file()";
> -+ my_errno= ER_UNKNOWN_ERROR;
> -+ goto err;
> ++ errmsg= "failed in send_file()";
> ++ my_errno= ER_UNKNOWN_ERROR;
> ++ goto err;
And what's the reason for this?
> @@ -506,7 +3322,7 @@
> + // find end of the next line
> + for (pend= pbeg + 1;
> + ++cnt <= m_query_len && *pend != '\r' && *pend != '\n';
> -+ pend++) ;
> ++ pend++) {};
> +
> + // print next line
> + my_b_write(
Alexey Kopytov (akopytov) : Posted in a previous version of this proposal | # |
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal | # |
Alexey -
> > -+ errmsg = "Failed on my_net_write()";
> > ++ errmsg= "Failed on my_net_write()";
Isn't this a correct change, a space before "=" removal?
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal | # |
On 09.02.12 8:56, Laurynas Biveinis wrote:
> Alexey -
>
>>> -+ errmsg = "Failed on my_net_write()";
>>> ++ errmsg= "Failed on my_net_write()";
>
> Isn't this a correct change, a space before "=" removal?
There were 2 spaces after '='.
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal | # |
Actually, 3, to align it with the next "my_errno=..." line.
Alexey Kopytov (akopytov) : | # |
Preview Diff
1 | === modified file 'patches/mysql-test-rnt.diff' | |||
2 | --- patches/mysql-test-rnt.diff 2012-02-06 06:00:16 +0000 | |||
3 | +++ patches/mysql-test-rnt.diff 2012-02-13 03:48:59 +0000 | |||
4 | @@ -1,27 +1,3 @@ | |||
5 | 1 | --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | ||
6 | 2 | +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | ||
7 | 3 | @@ -321,14 +321,19 @@ | ||
8 | 4 | # we check that the error code of the "ROLLBACK" event is 0 and not | ||
9 | 5 | # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction | ||
10 | 6 | # and does not make slave to stop) | ||
11 | 7 | + | ||
12 | 8 | +-- source include/binlog_start_pos.inc | ||
13 | 9 | + | ||
14 | 10 | if (`select @@binlog_format = 'ROW'`) | ||
15 | 11 | { | ||
16 | 12 | - --exec $MYSQL_BINLOG --start-position=524 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output | ||
17 | 13 | + let $start_pos= `select @binlog_start_pos + 418`; | ||
18 | 14 | + --exec $MYSQL_BINLOG --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output | ||
19 | 15 | } | ||
20 | 16 | |||
21 | 17 | if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`) | ||
22 | 18 | { | ||
23 | 19 | - --exec $MYSQL_BINLOG --start-position=555 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output | ||
24 | 20 | + let $start_pos= `select @binlog_start_pos + 449`; | ||
25 | 21 | + --exec $MYSQL_BINLOG --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output | ||
26 | 22 | } | ||
27 | 23 | |||
28 | 24 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
29 | 25 | --- /dev/null | 1 | --- /dev/null |
30 | 26 | +++ b/mysql-test/extra/rpl_tests/check_type.inc | 2 | +++ b/mysql-test/extra/rpl_tests/check_type.inc |
31 | 27 | @@ -0,0 +1,52 @@ | 3 | @@ -0,0 +1,52 @@ |
32 | @@ -259,16 +235,6 @@ | |||
33 | 259 | --let $slave_skip_counter= 2 | 235 | --let $slave_skip_counter= 2 |
34 | 260 | --let $show_slave_sql_error= 1 | 236 | --let $show_slave_sql_error= 1 |
35 | 261 | --source include/wait_for_slave_sql_error_and_skip.inc | 237 | --source include/wait_for_slave_sql_error_and_skip.inc |
36 | 262 | --- a/mysql-test/extra/rpl_tests/rpl_log.test | ||
37 | 263 | +++ b/mysql-test/extra/rpl_tests/rpl_log.test | ||
38 | 264 | @@ -14,6 +14,7 @@ | ||
39 | 265 | reset master; | ||
40 | 266 | reset slave; | ||
41 | 267 | source include/start_slave.inc; | ||
42 | 268 | +source include/binlog_start_pos.inc; | ||
43 | 269 | |||
44 | 270 | let $VERSION=`select version()`; | ||
45 | 271 | |||
46 | 272 | --- a/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc | 238 | --- a/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc |
47 | 273 | +++ b/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc | 239 | +++ b/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc |
48 | 274 | @@ -532,6 +532,16 @@ | 240 | @@ -532,6 +532,16 @@ |
49 | @@ -288,165 +254,6 @@ | |||
50 | 288 | --disable_query_log | 254 | --disable_query_log |
51 | 289 | SET @commands= LTRIM(SUBSTRING(@commands, LENGTH(@command) + 1)); | 255 | SET @commands= LTRIM(SUBSTRING(@commands, LENGTH(@command) + 1)); |
52 | 290 | inc $stmt_id; | 256 | inc $stmt_id; |
53 | 291 | --- /dev/null | ||
54 | 292 | +++ b/mysql-test/extra/rpl_tests/rpl_row_annotate.test | ||
55 | 293 | @@ -0,0 +1,156 @@ | ||
56 | 294 | +######################################################################## | ||
57 | 295 | +# WL47: Store in binlog text of statements that caused RBR events | ||
58 | 296 | +# new event : ANNOTATE_ROWS_EVENT | ||
59 | 297 | +# new master option : --binlog-annotate-rows-events | ||
60 | 298 | +# new slave option : --replicate-annotate-rows-events | ||
61 | 299 | +######################################################################## | ||
62 | 300 | +--source include/master-slave.inc | ||
63 | 301 | +connect (master2,127.0.0.1,root,,test,$MASTER_MYPORT,); | ||
64 | 302 | + | ||
65 | 303 | +connection master; | ||
66 | 304 | +--disable_query_log | ||
67 | 305 | + | ||
68 | 306 | +--disable_warnings | ||
69 | 307 | +DROP DATABASE IF EXISTS test1; | ||
70 | 308 | +--enable_warnings | ||
71 | 309 | + | ||
72 | 310 | +CREATE DATABASE test1; | ||
73 | 311 | +USE test1; | ||
74 | 312 | + | ||
75 | 313 | +CREATE TABLE t1(a int primary key, b int); | ||
76 | 314 | +CREATE TABLE t2(a int, b int); | ||
77 | 315 | +CREATE TABLE t3(a int, b int); | ||
78 | 316 | +CREATE TABLE t4(a int, b int); | ||
79 | 317 | +CREATE TABLE xt1(a int, b int); | ||
80 | 318 | +CREATE TABLE xt2(a int, b int); | ||
81 | 319 | + | ||
82 | 320 | +CREATE TABLE t5 ( | ||
83 | 321 | + a INT PRIMARY KEY AUTO_INCREMENT, | ||
84 | 322 | + b VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_bin | ||
85 | 323 | +); | ||
86 | 324 | + | ||
87 | 325 | +SET SESSION binlog_annotate_rows_events = OFF; | ||
88 | 326 | + | ||
89 | 327 | +INSERT INTO t1 VALUES (0,0), (1,1); | ||
90 | 328 | + | ||
91 | 329 | +SET SESSION binlog_annotate_rows_events = ON; | ||
92 | 330 | + | ||
93 | 331 | +UPDATE t1 SET b = b + 1; | ||
94 | 332 | +REPLACE t1 VALUES (1,1), (2,2), (3,3); | ||
95 | 333 | + | ||
96 | 334 | +INSERT INTO t2 VALUES (1,1), (2,2), (3,3); | ||
97 | 335 | +INSERT INTO t3 VALUES (1,1), (2,2), (3,3); | ||
98 | 336 | +DELETE t1, t2 FROM t1 INNER JOIN t2 INNER JOIN t3 WHERE t1.a=t2.a AND t2.a=t3.a; | ||
99 | 337 | + | ||
100 | 338 | +INSERT INTO xt1 VALUES (1,1), (2,2), (3,3); | ||
101 | 339 | +INSERT INTO t2 VALUES (1,1), (2,2), (3,3); | ||
102 | 340 | +DELETE xt1, t2 FROM xt1 INNER JOIN t2 INNER JOIN t3 WHERE xt1.a=t2.a AND t2.a=t3.a; | ||
103 | 341 | + | ||
104 | 342 | +INSERT INTO xt1 VALUES (1,1), (2,2), (3,3); | ||
105 | 343 | +INSERT INTO xt2 VALUES (1,1), (2,2), (3,3); | ||
106 | 344 | +DELETE xt1, xt2 FROM xt1 INNER JOIN xt2 INNER JOIN t3 WHERE xt1.a=xt2.a AND xt2.a=t3.a; | ||
107 | 345 | + | ||
108 | 346 | +INSERT INTO t5(b) VALUES ('foo'), ('bar'), ('baz'); | ||
109 | 347 | +SET NAMES latin1; | ||
110 | 348 | +INSERT INTO t5(b) VALUES ('gås'); | ||
111 | 349 | +SET NAMES utf8; | ||
112 | 350 | +INSERT INTO t5(b) VALUES ('gås'); | ||
113 | 351 | +SET NAMES latin1; | ||
114 | 352 | + | ||
115 | 353 | +FLUSH LOGS; | ||
116 | 354 | + | ||
117 | 355 | +--echo ######################################################################## | ||
118 | 356 | +--echo # TABLES ON MASTER | ||
119 | 357 | +--echo ######################################################################## | ||
120 | 358 | +--enable_query_log | ||
121 | 359 | + | ||
122 | 360 | +SELECT * FROM t1 ORDER BY a; | ||
123 | 361 | +SELECT * FROM t2 ORDER BY a; | ||
124 | 362 | +SELECT * FROM t3 ORDER BY a; | ||
125 | 363 | +SELECT * FROM t5 ORDER BY a; | ||
126 | 364 | + | ||
127 | 365 | +sync_slave_with_master; | ||
128 | 366 | +--echo ######################################################################## | ||
129 | 367 | +--echo # TABLES ON SLAVE: should be the same as on master | ||
130 | 368 | +--echo ######################################################################## | ||
131 | 369 | +--disable_query_log | ||
132 | 370 | +USE test1; | ||
133 | 371 | +--enable_query_log | ||
134 | 372 | + | ||
135 | 373 | +SELECT * FROM t1 ORDER BY a; | ||
136 | 374 | +SELECT * FROM t2 ORDER BY a; | ||
137 | 375 | +SELECT * FROM t3 ORDER BY a; | ||
138 | 376 | +SELECT * FROM t5 ORDER BY a; | ||
139 | 377 | + | ||
140 | 378 | +--echo ######################################################################## | ||
141 | 379 | +--echo # EVENTS ON SLAVE | ||
142 | 380 | +let $annotate= `select @@global.replicate_annotate_rows_events`; | ||
143 | 381 | +if ($annotate) | ||
144 | 382 | +{ | ||
145 | 383 | + --echo # The following Annotate_rows events should appear below: | ||
146 | 384 | + --echo # - UPDATE t1 SET b = b + 1; | ||
147 | 385 | + --echo # - REPLACE t1 VALUES (1,1), (2,2), (3,3); | ||
148 | 386 | + --echo # - INSERT INTO t2 VALUES (1,1), (2,2), (3,3) | ||
149 | 387 | + --echo # - INSERT INTO t3 VALUES (1,1), (2,2), (3,3) | ||
150 | 388 | + --echo # - DELETE t1, t2 FROM <...> | ||
151 | 389 | + --echo # - INSERT INTO t2 VALUES (1,1), (2,2), (3,3) | ||
152 | 390 | + --echo # - DELETE xt1, t2 FROM <...> | ||
153 | 391 | + --echo # - INSERT INTO t5(b) VALUES <...> (3 instances) | ||
154 | 392 | +} | ||
155 | 393 | +if (!$annotate) | ||
156 | 394 | +{ | ||
157 | 395 | + --echo # No Annotate_rows events should appear below | ||
158 | 396 | +} | ||
159 | 397 | +--echo ######################################################################## | ||
160 | 398 | +FLUSH LOGS; | ||
161 | 399 | + | ||
162 | 400 | +--source include/binlog_start_pos.inc | ||
163 | 401 | +let $start_pos= `select @binlog_start_pos`; | ||
164 | 402 | +--replace_column 2 # 5 # | ||
165 | 403 | +--replace_result $start_pos <start_pos> | ||
166 | 404 | +--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// | ||
167 | 405 | +--eval show binlog events in 'slave-bin.000001' from $start_pos | ||
168 | 406 | + | ||
169 | 407 | +--echo # | ||
170 | 408 | +--echo ######################################################################## | ||
171 | 409 | +--echo # INSERTs DELAYED ON MASTERs | ||
172 | 410 | +--echo ######################################################################## | ||
173 | 411 | +connection master; | ||
174 | 412 | +SET SESSION binlog_annotate_rows_events = ON; | ||
175 | 413 | +INSERT DELAYED INTO test1.t4 VALUES (1,1); | ||
176 | 414 | +FLUSH TABLES; | ||
177 | 415 | +SELECT * FROM test1.t4 ORDER BY a; | ||
178 | 416 | + | ||
179 | 417 | +sync_slave_with_master; | ||
180 | 418 | +connection master; | ||
181 | 419 | +sync_slave_with_master; | ||
182 | 420 | + | ||
183 | 421 | +--echo ######################################################################## | ||
184 | 422 | +--echo # ON SLAVE | ||
185 | 423 | +--echo # No Annotate_rows events should appear below | ||
186 | 424 | +--echo ######################################################################## | ||
187 | 425 | +FLUSH LOGS; | ||
188 | 426 | + | ||
189 | 427 | +--exec $MYSQL --host=127.0.0.1 --port=$SLAVE_MYPORT test -e "show binlog events in 'slave-bin.000002'" > $MYSQLTEST_VARDIR/tmp/annotated_events.txt | ||
190 | 428 | +perl; | ||
191 | 429 | + open F, '<', "$ENV{MYSQLTEST_VARDIR}/tmp/annotated_events.txt" or die; | ||
192 | 430 | + binmode STDOUT; | ||
193 | 431 | + while (defined ($_ = <F>)) { | ||
194 | 432 | + if (/Annotate_rows/) { | ||
195 | 433 | + s/[0-9]+\sAnnotate_rows\s[0-9]+\s[0-9]+/# Annotate_rows # #/; | ||
196 | 434 | + print($_); | ||
197 | 435 | + $_ = <F>; | ||
198 | 436 | + s/[0-9]+\sTable_map\s[0-9]+\s[0-9]+\stable_id:\s[0-9]+/# Table_map # # table_id: #/; | ||
199 | 437 | + print($_); | ||
200 | 438 | + } | ||
201 | 439 | + } | ||
202 | 440 | +EOF | ||
203 | 441 | + | ||
204 | 442 | +# Clean-up | ||
205 | 443 | +connection master; | ||
206 | 444 | +--disable_query_log | ||
207 | 445 | +DROP DATABASE test1; | ||
208 | 446 | +sync_slave_with_master; | ||
209 | 447 | +--enable_query_log | ||
210 | 448 | + | ||
211 | 449 | +--source include/rpl_end.inc | ||
212 | 450 | --- a/mysql-test/extra/rpl_tests/rpl_row_basic.test | 257 | --- a/mysql-test/extra/rpl_tests/rpl_row_basic.test |
213 | 451 | +++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test | 258 | +++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test |
214 | 452 | @@ -6,6 +6,10 @@ | 259 | @@ -6,6 +6,10 @@ |
215 | @@ -1490,54 +1297,6 @@ | |||
216 | 1490 | +source include/rpl_reset.inc; | 1297 | +source include/rpl_reset.inc; |
217 | 1491 | +enable_warnings; | 1298 | +enable_warnings; |
218 | 1492 | +enable_query_log; | 1299 | +enable_query_log; |
219 | 1493 | --- /dev/null | ||
220 | 1494 | +++ b/mysql-test/include/binlog_start_pos.inc | ||
221 | 1495 | @@ -0,0 +1,26 @@ | ||
222 | 1496 | +############################################################################## | ||
223 | 1497 | +# | ||
224 | 1498 | +# binlog_start_pos is the postion of the the first event in the binary log | ||
225 | 1499 | +# which follows the Format description event. Intended to reduce test suite | ||
226 | 1500 | +# dependance on the Format description event length changes (e.g. in case | ||
227 | 1501 | +# of adding new events). Evaluated as: | ||
228 | 1502 | +# | ||
229 | 1503 | +# binlog_start_pos = 4 /* binlog header */ + | ||
230 | 1504 | +# (Format_description_log_event length) | ||
231 | 1505 | +# | ||
232 | 1506 | +# Format_description_log_event length = | ||
233 | 1507 | +# 19 /* event common header */ + | ||
234 | 1508 | +# 57 /* misc stuff in the Format description header */ + | ||
235 | 1509 | +# number of events. | ||
236 | 1510 | +# | ||
237 | 1511 | +# With current number of events = 160, | ||
238 | 1512 | +# | ||
239 | 1513 | +# binlog_start_pos = 4 + 19 + 57 + 160 = 240. | ||
240 | 1514 | +# | ||
241 | 1515 | +############################################################################## | ||
242 | 1516 | + | ||
243 | 1517 | +let $binlog_start_pos=240; | ||
244 | 1518 | +--disable_query_log | ||
245 | 1519 | +SET @binlog_start_pos=240; | ||
246 | 1520 | +--enable_query_log | ||
247 | 1521 | + | ||
248 | 1522 | --- a/mysql-test/include/show_binlog_events2.inc | ||
249 | 1523 | +++ b/mysql-test/include/show_binlog_events2.inc | ||
250 | 1524 | @@ -1,4 +1,4 @@ | ||
251 | 1525 | ---let $binlog_start=106 | ||
252 | 1526 | +--let $binlog_start=240 | ||
253 | 1527 | --replace_result $binlog_start <binlog_start> | ||
254 | 1528 | --replace_column 2 # 5 # | ||
255 | 1529 | --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ | ||
256 | 1530 | --- a/mysql-test/include/show_binlog_events.inc | ||
257 | 1531 | +++ b/mysql-test/include/show_binlog_events.inc | ||
258 | 1532 | @@ -3,7 +3,7 @@ | ||
259 | 1533 | # | ||
260 | 1534 | # Useage: | ||
261 | 1535 | # let $binlog_file= master-bin.000002; | ||
262 | 1536 | -# let $binlog_start= 106; | ||
263 | 1537 | +# let $binlog_start= 240; | ||
264 | 1538 | # let $binlog_limit= 1, 3; | ||
265 | 1539 | # source include/show_binlog_events.inc; | ||
266 | 1540 | # | ||
267 | 1541 | --- a/mysql-test/include/test_fieldsize.inc | 1300 | --- a/mysql-test/include/test_fieldsize.inc |
268 | 1542 | +++ b/mysql-test/include/test_fieldsize.inc | 1301 | +++ b/mysql-test/include/test_fieldsize.inc |
269 | 1543 | @@ -22,7 +22,7 @@ | 1302 | @@ -22,7 +22,7 @@ |
270 | @@ -1549,69 +1308,6 @@ | |||
271 | 1549 | --let $show_slave_sql_error= 1 | 1308 | --let $show_slave_sql_error= 1 |
272 | 1550 | --source include/wait_for_slave_sql_error.inc | 1309 | --source include/wait_for_slave_sql_error.inc |
273 | 1551 | 1310 | ||
274 | 1552 | --- a/mysql-test/r/ctype_cp932_binlog_stm.result | ||
275 | 1553 | +++ b/mysql-test/r/ctype_cp932_binlog_stm.result | ||
276 | 1554 | @@ -44,9 +44,6 @@ | ||
277 | 1555 | master-bin.000001 # Query # # use `test`; DROP PROCEDURE bug18293 | ||
278 | 1556 | master-bin.000001 # Query # # use `test`; DROP TABLE t4 | ||
279 | 1557 | End of 5.0 tests | ||
280 | 1558 | -call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49"); | ||
281 | 1559 | -SHOW BINLOG EVENTS FROM 365; | ||
282 | 1560 | -ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error | ||
283 | 1561 | Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment. | ||
284 | 1562 | CREATE TABLE t1 (a varchar(16)) character set cp932; | ||
285 | 1563 | INSERT INTO t1 VALUES (0x8372835E),(0x8352835E); | ||
286 | 1564 | --- a/mysql-test/r/mysqlbinlog.result | ||
287 | 1565 | +++ b/mysql-test/r/mysqlbinlog.result | ||
288 | 1566 | @@ -1,15 +1,17 @@ | ||
289 | 1567 | reset master; | ||
290 | 1568 | +SET @save_binlog_size= @@global.max_binlog_size; | ||
291 | 1569 | +SET @@global.max_binlog_size= 4096; | ||
292 | 1570 | set timestamp=1000000000; | ||
293 | 1571 | drop table if exists t1,t2,t3,t4,t5,t03,t04; | ||
294 | 1572 | create table t1 (word varchar(20)); | ||
295 | 1573 | create table t2 (id int auto_increment not null primary key); | ||
296 | 1574 | insert into t1 values ("abirvalg"); | ||
297 | 1575 | insert into t2 values (); | ||
298 | 1576 | -load data infile '../../std_data/words.dat' into table t1; | ||
299 | 1577 | -load data infile '../../std_data/words.dat' into table t1; | ||
300 | 1578 | -load data infile '../../std_data/words.dat' into table t1; | ||
301 | 1579 | -load data infile '../../std_data/words.dat' into table t1; | ||
302 | 1580 | -load data infile '../../std_data/words.dat' into table t1; | ||
303 | 1581 | +load data infile '../../std_data/words3.dat' into table t1; | ||
304 | 1582 | +load data infile '../../std_data/words3.dat' into table t1; | ||
305 | 1583 | +load data infile '../../std_data/words3.dat' into table t1; | ||
306 | 1584 | +load data infile '../../std_data/words3.dat' into table t1; | ||
307 | 1585 | +load data infile '../../std_data/words3.dat' into table t1; | ||
308 | 1586 | insert into t1 values ("Alas"); | ||
309 | 1587 | flush logs; | ||
310 | 1588 | |||
311 | 1589 | @@ -255,6 +257,7 @@ | ||
312 | 1590 | ROLLBACK /* added by mysqlbinlog */; | ||
313 | 1591 | /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; | ||
314 | 1592 | drop table t1,t2; | ||
315 | 1593 | +SET @@global.max_binlog_size= @save_binlog_size; | ||
316 | 1594 | flush logs; | ||
317 | 1595 | flush logs; | ||
318 | 1596 | select * from t5 /* must be (1),(1) */; | ||
319 | 1597 | @@ -377,14 +380,14 @@ | ||
320 | 1598 | /*!*/; | ||
321 | 1599 | SET TIMESTAMP=1000000000/*!*/; | ||
322 | 1600 | SET @@session.collation_database=7/*!*/; | ||
323 | 1601 | -LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-a-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
324 | 1602 | +LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
325 | 1603 | /*!*/; | ||
326 | 1604 | SET TIMESTAMP=1000000000/*!*/; | ||
327 | 1605 | SET @@session.collation_database=DEFAULT/*!*/; | ||
328 | 1606 | -LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-b-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
329 | 1607 | +LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
330 | 1608 | /*!*/; | ||
331 | 1609 | SET TIMESTAMP=1000000000/*!*/; | ||
332 | 1610 | -LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-c-0' INTO TABLE `t1` CHARACTER SET koi8r FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
333 | 1611 | +LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` CHARACTER SET koi8r FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
334 | 1612 | /*!*/; | ||
335 | 1613 | SET TIMESTAMP=1000000000/*!*/; | ||
336 | 1614 | drop table t1 | ||
337 | 1615 | --- /dev/null | 1311 | --- /dev/null |
338 | 1616 | +++ b/mysql-test/r/percona_fast_alter_column.result | 1312 | +++ b/mysql-test/r/percona_fast_alter_column.result |
339 | 1617 | @@ -0,0 +1,47 @@ | 1313 | @@ -0,0 +1,47 @@ |
340 | @@ -1778,75 +1474,6 @@ | |||
341 | 1778 | +DEFAULT(t2) | 1474 | +DEFAULT(t2) |
342 | 1779 | +0000-00-00 00:00:00 | 1475 | +0000-00-00 00:00:00 |
343 | 1780 | +DROP TABLE test; | 1476 | +DROP TABLE test; |
344 | 1781 | --- /dev/null | ||
345 | 1782 | +++ b/mysql-test/std_data/words3.dat | ||
346 | 1783 | @@ -0,0 +1,66 @@ | ||
347 | 1784 | +Aarhus | ||
348 | 1785 | +Aaron | ||
349 | 1786 | +Ababa | ||
350 | 1787 | +aback | ||
351 | 1788 | +abaft | ||
352 | 1789 | +abandon | ||
353 | 1790 | +abandoned | ||
354 | 1791 | +abandoning | ||
355 | 1792 | +abandonment | ||
356 | 1793 | +abandons | ||
357 | 1794 | +Aarhus | ||
358 | 1795 | +Aaron | ||
359 | 1796 | +Ababa | ||
360 | 1797 | +aback | ||
361 | 1798 | +abaft | ||
362 | 1799 | +abandon | ||
363 | 1800 | +abandoned | ||
364 | 1801 | +abandoning | ||
365 | 1802 | +abandonment | ||
366 | 1803 | +abandons | ||
367 | 1804 | +abase | ||
368 | 1805 | +abased | ||
369 | 1806 | +abasement | ||
370 | 1807 | +abasements | ||
371 | 1808 | +abases | ||
372 | 1809 | +abash | ||
373 | 1810 | +abashed | ||
374 | 1811 | +abashes | ||
375 | 1812 | +abashing | ||
376 | 1813 | +abasing | ||
377 | 1814 | +abate | ||
378 | 1815 | +abated | ||
379 | 1816 | +abatement | ||
380 | 1817 | +abatements | ||
381 | 1818 | +abater | ||
382 | 1819 | +abates | ||
383 | 1820 | +abating | ||
384 | 1821 | +Abba | ||
385 | 1822 | +abbe | ||
386 | 1823 | +abbey | ||
387 | 1824 | +abbeys | ||
388 | 1825 | +abbot | ||
389 | 1826 | +abbots | ||
390 | 1827 | +Abbott | ||
391 | 1828 | +abbreviate | ||
392 | 1829 | +abbreviated | ||
393 | 1830 | +abbreviates | ||
394 | 1831 | +abbreviating | ||
395 | 1832 | +abbreviation | ||
396 | 1833 | +abbreviations | ||
397 | 1834 | +Abby | ||
398 | 1835 | +abdomen | ||
399 | 1836 | +abdomens | ||
400 | 1837 | +abdominal | ||
401 | 1838 | +abduct | ||
402 | 1839 | +abducted | ||
403 | 1840 | +abduction | ||
404 | 1841 | +abductions | ||
405 | 1842 | +abductor | ||
406 | 1843 | +abductors | ||
407 | 1844 | +abducts | ||
408 | 1845 | +Abe | ||
409 | 1846 | +abed | ||
410 | 1847 | +Abel | ||
411 | 1848 | +Abelian | ||
412 | 1849 | +Abelson | ||
413 | 1850 | --- a/mysql-test/suite/binlog/r/binlog_base64_flag.result | 1477 | --- a/mysql-test/suite/binlog/r/binlog_base64_flag.result |
414 | 1851 | +++ b/mysql-test/suite/binlog/r/binlog_base64_flag.result | 1478 | +++ b/mysql-test/suite/binlog/r/binlog_base64_flag.result |
415 | 1852 | @@ -93,6 +93,7 @@ | 1479 | @@ -93,6 +93,7 @@ |
416 | @@ -1857,26 +1484,6 @@ | |||
417 | 1857 | # | 1484 | # |
418 | 1858 | # Bug #54393: crash and/or valgrind errors in | 1485 | # Bug #54393: crash and/or valgrind errors in |
419 | 1859 | # mysql_client_binlog_statement | 1486 | # mysql_client_binlog_statement |
420 | 1860 | --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result | ||
421 | 1861 | +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result | ||
422 | 1862 | @@ -331,7 +331,7 @@ | ||
423 | 1863 | master-bin.000001 # Query # # use `test`; insert into t1 values( 243 ) | ||
424 | 1864 | master-bin.000001 # Query # # use `test`; insert into t1 values( 242 ) | ||
425 | 1865 | master-bin.000001 # Query # # use `test`; insert into t1 values( 241 ) | ||
426 | 1866 | -master-bin.000001 # Query # # use `test`; insert into t1 values( 240 ) | ||
427 | 1867 | +master-bin.000001 # Query # # use `test`; insert into t1 values( <binlog_start> ) | ||
428 | 1868 | master-bin.000001 # Query # # use `test`; insert into t1 values( 239 ) | ||
429 | 1869 | master-bin.000001 # Query # # use `test`; insert into t1 values( 238 ) | ||
430 | 1870 | master-bin.000001 # Query # # use `test`; insert into t1 values( 237 ) | ||
431 | 1871 | @@ -465,7 +465,7 @@ | ||
432 | 1872 | master-bin.000001 # Query # # use `test`; insert into t1 values( 109 ) | ||
433 | 1873 | master-bin.000001 # Query # # use `test`; insert into t1 values( 108 ) | ||
434 | 1874 | master-bin.000001 # Query # # use `test`; insert into t1 values( 107 ) | ||
435 | 1875 | -master-bin.000001 # Query # # use `test`; insert into t1 values( <binlog_start> ) | ||
436 | 1876 | +master-bin.000001 # Query # # use `test`; insert into t1 values( 106 ) | ||
437 | 1877 | master-bin.000001 # Query # # use `test`; insert into t1 values( 105 ) | ||
438 | 1878 | master-bin.000001 # Query # # use `test`; insert into t1 values( 104 ) | ||
439 | 1879 | master-bin.000001 # Query # # use `test`; insert into t1 values( 103 ) | ||
440 | 1880 | --- a/mysql-test/suite/binlog/t/binlog_base64_flag.test | 1487 | --- a/mysql-test/suite/binlog/t/binlog_base64_flag.test |
441 | 1881 | +++ b/mysql-test/suite/binlog/t/binlog_base64_flag.test | 1488 | +++ b/mysql-test/suite/binlog/t/binlog_base64_flag.test |
442 | 1882 | @@ -153,6 +153,7 @@ | 1489 | @@ -153,6 +153,7 @@ |
443 | @@ -1887,258 +1494,6 @@ | |||
444 | 1887 | 1494 | ||
445 | 1888 | --echo # | 1495 | --echo # |
446 | 1889 | --echo # Bug #54393: crash and/or valgrind errors in | 1496 | --echo # Bug #54393: crash and/or valgrind errors in |
447 | 1890 | --- a/mysql-test/suite/binlog/t/binlog_incident.test | ||
448 | 1891 | +++ b/mysql-test/suite/binlog/t/binlog_incident.test | ||
449 | 1892 | @@ -4,6 +4,7 @@ | ||
450 | 1893 | |||
451 | 1894 | source include/have_log_bin.inc; | ||
452 | 1895 | source include/have_debug.inc; | ||
453 | 1896 | +source include/binlog_start_pos.inc; | ||
454 | 1897 | |||
455 | 1898 | let $MYSQLD_DATADIR= `select @@datadir`; | ||
456 | 1899 | RESET MASTER; | ||
457 | 1900 | @@ -20,7 +21,7 @@ | ||
458 | 1901 | DROP TABLE t1; | ||
459 | 1902 | FLUSH LOGS; | ||
460 | 1903 | |||
461 | 1904 | -exec $MYSQL_BINLOG --start-position=106 $MYSQLD_DATADIR/master-bin.000001 >$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql; | ||
462 | 1905 | +exec $MYSQL_BINLOG --start-position=$binlog_start_pos $MYSQLD_DATADIR/master-bin.000001 >$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql; | ||
463 | 1906 | --disable_query_log | ||
464 | 1907 | 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; | ||
465 | 1908 | --enable_query_log | ||
466 | 1909 | --- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test | ||
467 | 1910 | +++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test | ||
468 | 1911 | @@ -1,5 +1,6 @@ | ||
469 | 1912 | -- source include/have_debug.inc | ||
470 | 1913 | -- source include/have_binlog_format_statement.inc | ||
471 | 1914 | +-- source include/binlog_start_pos.inc | ||
472 | 1915 | # | ||
473 | 1916 | # bug#27571 asynchronous setting mysql_$query()'s local error and | ||
474 | 1917 | # Query_log_event::error_code | ||
475 | 1918 | @@ -24,7 +25,7 @@ | ||
476 | 1919 | # for some constants like the offset of the first real event | ||
477 | 1920 | # that is different between severs versions. | ||
478 | 1921 | let $MYSQLD_DATADIR= `select @@datadir`; | ||
479 | 1922 | ---exec $MYSQL_BINLOG --force-if-open --start-position=106 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog | ||
480 | 1923 | +--exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog | ||
481 | 1924 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
482 | 1925 | eval select | ||
483 | 1926 | (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) | ||
484 | 1927 | --- a/mysql-test/suite/binlog/t/binlog_killed.test | ||
485 | 1928 | +++ b/mysql-test/suite/binlog/t/binlog_killed.test | ||
486 | 1929 | @@ -1,5 +1,6 @@ | ||
487 | 1930 | -- source include/have_innodb.inc | ||
488 | 1931 | -- source include/have_binlog_format_statement.inc | ||
489 | 1932 | +-- source include/binlog_start_pos.inc | ||
490 | 1933 | |||
491 | 1934 | # You cannot use `KILL' with the Embedded MySQL Server library, | ||
492 | 1935 | # because the embedded server merely runs inside the threads of the host | ||
493 | 1936 | @@ -51,7 +52,8 @@ | ||
494 | 1937 | let $rows= `select count(*) from t2 /* must be 2 or 0 */`; | ||
495 | 1938 | |||
496 | 1939 | let $MYSQLD_DATADIR= `select @@datadir`; | ||
497 | 1940 | ---exec $MYSQL_BINLOG --force-if-open --start-position=134 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog | ||
498 | 1941 | +let $start_pos= `select @binlog_start_pos + 28`; | ||
499 | 1942 | +--exec $MYSQL_BINLOG --force-if-open --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog | ||
500 | 1943 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
501 | 1944 | eval select | ||
502 | 1945 | (@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog")) | ||
503 | 1946 | --- /dev/null | ||
504 | 1947 | +++ b/mysql-test/suite/binlog/t/binlog_row_annotate-master.opt | ||
505 | 1948 | @@ -0,0 +1 @@ | ||
506 | 1949 | +--timezone=GMT-3 --binlog-do-db=test1 --binlog-do-db=test2 --binlog-do-db=test3 | ||
507 | 1950 | --- /dev/null | ||
508 | 1951 | +++ b/mysql-test/suite/binlog/t/binlog_row_annotate.test | ||
509 | 1952 | @@ -0,0 +1,189 @@ | ||
510 | 1953 | +############################################################################### | ||
511 | 1954 | +# WL47: Store in binlog text of statements that caused RBR events | ||
512 | 1955 | +# new event: ANNOTATE_ROWS_EVENT | ||
513 | 1956 | +# new master option: --binlog-annotate-rows-events | ||
514 | 1957 | +# new mysqlbinlog option: --skip-annotate-rows-events | ||
515 | 1958 | +# | ||
516 | 1959 | +# Intended to test that: | ||
517 | 1960 | +# *** If the --binlog-annotate-rows-events option is switched on on master | ||
518 | 1961 | +# then Annotate_rows events: | ||
519 | 1962 | +# - are generated; | ||
520 | 1963 | +# - are genrated only once for "multi-table-maps" rbr queries; | ||
521 | 1964 | +# - are not generated when the corresponding queries are filtered away; | ||
522 | 1965 | +# - are generated when the corresponding queries are filtered away partialy | ||
523 | 1966 | +# (e.g. in case of multi-delete). | ||
524 | 1967 | +# *** Annotate_rows events are printed by mysqlbinlog started without | ||
525 | 1968 | +# --skip-annotate-rows-events options both in remote and local cases. | ||
526 | 1969 | +# *** Annotate_rows events are not printed by mysqlbinlog started with | ||
527 | 1970 | +# --skip-annotate-rows-events options both in remote and local cases. | ||
528 | 1971 | +############################################################################### | ||
529 | 1972 | + | ||
530 | 1973 | +--source include/have_log_bin.inc | ||
531 | 1974 | +--source include/have_binlog_format_row.inc | ||
532 | 1975 | +--source include/binlog_start_pos.inc | ||
533 | 1976 | + | ||
534 | 1977 | +--disable_query_log | ||
535 | 1978 | + | ||
536 | 1979 | +# Fix timestamp to avoid varying results | ||
537 | 1980 | +SET timestamp=1000000000; | ||
538 | 1981 | + | ||
539 | 1982 | +# Delete all existing binary logs | ||
540 | 1983 | +RESET MASTER; | ||
541 | 1984 | + | ||
542 | 1985 | +--disable_warnings | ||
543 | 1986 | +DROP DATABASE IF EXISTS test1; | ||
544 | 1987 | +DROP DATABASE IF EXISTS test2; | ||
545 | 1988 | +DROP DATABASE IF EXISTS test3; | ||
546 | 1989 | +DROP DATABASE IF EXISTS xtest1; | ||
547 | 1990 | +DROP DATABASE IF EXISTS xtest2; | ||
548 | 1991 | +--enable_warnings | ||
549 | 1992 | + | ||
550 | 1993 | +CREATE DATABASE test1; | ||
551 | 1994 | +CREATE TABLE test1.t1(a int); | ||
552 | 1995 | + | ||
553 | 1996 | +CREATE DATABASE test2; | ||
554 | 1997 | +CREATE TABLE test2.t2(a int); | ||
555 | 1998 | +CREATE VIEW test2.v2 AS SELECT * FROM test2.t2; | ||
556 | 1999 | + | ||
557 | 2000 | +CREATE DATABASE test3; | ||
558 | 2001 | +CREATE TABLE test3.t3(a int); | ||
559 | 2002 | + | ||
560 | 2003 | +CREATE DATABASE xtest1; | ||
561 | 2004 | +CREATE TABLE xtest1.xt1(a int); | ||
562 | 2005 | + | ||
563 | 2006 | +CREATE DATABASE xtest2; | ||
564 | 2007 | +CREATE TABLE xtest2.xt2(a int); | ||
565 | 2008 | + | ||
566 | 2009 | +# By default SESSION binlog_annotate_rows_events = OFF | ||
567 | 2010 | + | ||
568 | 2011 | +INSERT INTO test1.t1 VALUES (1), (2), (3); | ||
569 | 2012 | + | ||
570 | 2013 | +SET SESSION binlog_annotate_rows_events = ON; | ||
571 | 2014 | + | ||
572 | 2015 | +INSERT INTO test2.t2 VALUES (1), (2), (3); | ||
573 | 2016 | +INSERT INTO test3.t3 VALUES (1), (2), (3); | ||
574 | 2017 | + | ||
575 | 2018 | +# This query generates two Table maps but the Annotate | ||
576 | 2019 | +# event should appear only once before the first Table map | ||
577 | 2020 | +DELETE test1.t1, test2.t2 | ||
578 | 2021 | + FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
579 | 2022 | + WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3.a; | ||
580 | 2023 | + | ||
581 | 2024 | +# This event should be filtered out together with Annotate event | ||
582 | 2025 | +INSERT INTO xtest1.xt1 VALUES (1), (2), (3); | ||
583 | 2026 | + | ||
584 | 2027 | +# This event should pass the filter | ||
585 | 2028 | +INSERT INTO test2.v2 VALUES (1), (2), (3); | ||
586 | 2029 | + | ||
587 | 2030 | +# This event should pass the filter only for test2.t2 part | ||
588 | 2031 | +DELETE xtest1.xt1, test2.t2 | ||
589 | 2032 | + FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
590 | 2033 | + WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3.a; | ||
591 | 2034 | + | ||
592 | 2035 | +# These events should be filtered out together with Annotate events | ||
593 | 2036 | +INSERT INTO xtest1.xt1 VALUES (1), (2), (3); | ||
594 | 2037 | +INSERT INTO xtest2.xt2 VALUES (1), (2), (3); | ||
595 | 2038 | +DELETE xtest1.xt1, xtest2.xt2 | ||
596 | 2039 | + FROM xtest1.xt1 INNER JOIN xtest2.xt2 INNER JOIN test3.t3 | ||
597 | 2040 | + WHERE xtest1.xt1.a=xtest2.xt2.a AND xtest2.xt2.a=test3.t3.a; | ||
598 | 2041 | + | ||
599 | 2042 | +FLUSH LOGS; | ||
600 | 2043 | +--enable_query_log | ||
601 | 2044 | + | ||
602 | 2045 | +--echo ##################################################################################### | ||
603 | 2046 | +--echo # The following Annotate_rows events should appear below: | ||
604 | 2047 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
605 | 2048 | +--echo # - INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
606 | 2049 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> | ||
607 | 2050 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
608 | 2051 | +--echo # - DELETE xtest1.xt1, test2.t2 FROM <...> | ||
609 | 2052 | +--echo ##################################################################################### | ||
610 | 2053 | + | ||
611 | 2054 | +let $start_pos= `select @binlog_start_pos`; | ||
612 | 2055 | +--replace_column 2 # 5 # | ||
613 | 2056 | +--replace_result $start_pos <start_pos> | ||
614 | 2057 | +--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// | ||
615 | 2058 | +--eval show binlog events in 'master-bin.000001' from $start_pos | ||
616 | 2059 | + | ||
617 | 2060 | +--echo # | ||
618 | 2061 | +--echo ##################################################################################### | ||
619 | 2062 | +--echo # mysqlbinlog | ||
620 | 2063 | +--echo # The following Annotates should appear in this output: | ||
621 | 2064 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
622 | 2065 | +--echo # - INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
623 | 2066 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> (with two subsequent Table maps) | ||
624 | 2067 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
625 | 2068 | +--echo # - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map) | ||
626 | 2069 | +--echo ##################################################################################### | ||
627 | 2070 | + | ||
628 | 2071 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
629 | 2072 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
630 | 2073 | +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 | ||
631 | 2074 | + | ||
632 | 2075 | +--echo # | ||
633 | 2076 | +--echo ##################################################################################### | ||
634 | 2077 | +--echo # mysqlbinlog --database=test1 | ||
635 | 2078 | +--echo # The following Annotate should appear in this output: | ||
636 | 2079 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> | ||
637 | 2080 | +--echo ##################################################################################### | ||
638 | 2081 | + | ||
639 | 2082 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
640 | 2083 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
641 | 2084 | +--exec $MYSQL_BINLOG --base64-output=decode-rows --database=test1 -v -v $MYSQLD_DATADIR/master-bin.000001 | ||
642 | 2085 | + | ||
643 | 2086 | +--echo # | ||
644 | 2087 | +--echo ##################################################################################### | ||
645 | 2088 | +--echo # mysqlbinlog --skip-annotate-rows-events | ||
646 | 2089 | +--echo # No Annotates should appear in this output | ||
647 | 2090 | +--echo ##################################################################################### | ||
648 | 2091 | + | ||
649 | 2092 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
650 | 2093 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
651 | 2094 | +--exec $MYSQL_BINLOG --base64-output=decode-rows --skip-annotate-rows-events -v -v $MYSQLD_DATADIR/master-bin.000001 | ||
652 | 2095 | + | ||
653 | 2096 | +--echo # | ||
654 | 2097 | +--echo ##################################################################################### | ||
655 | 2098 | +--echo # mysqlbinlog --read-from-remote-server | ||
656 | 2099 | +--echo # The following Annotates should appear in this output: | ||
657 | 2100 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
658 | 2101 | +--echo # - INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
659 | 2102 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> (with two subsequent Table maps) | ||
660 | 2103 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
661 | 2104 | +--echo # - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map) | ||
662 | 2105 | +--echo ##################################################################################### | ||
663 | 2106 | + | ||
664 | 2107 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
665 | 2108 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
666 | 2109 | +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v --read-from-remote-server --user=root --host=localhost --port=$MASTER_MYPORT master-bin.000001 | ||
667 | 2110 | + | ||
668 | 2111 | +--echo # | ||
669 | 2112 | +--echo ##################################################################################### | ||
670 | 2113 | +--echo # mysqlbinlog --read-from-remote-server --database=test1 | ||
671 | 2114 | +--echo # The following Annotate should appear in this output: | ||
672 | 2115 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> | ||
673 | 2116 | +--echo ##################################################################################### | ||
674 | 2117 | + | ||
675 | 2118 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
676 | 2119 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
677 | 2120 | +--exec $MYSQL_BINLOG --base64-output=decode-rows --database=test1 -v -v --read-from-remote-server --user=root --host=localhost --port=$MASTER_MYPORT master-bin.000001 | ||
678 | 2121 | + | ||
679 | 2122 | +--echo # | ||
680 | 2123 | +--echo ##################################################################################### | ||
681 | 2124 | +--echo # mysqlbinlog --read-from-remote-server --skip-annotate-rows-events | ||
682 | 2125 | +--echo # No Annotates should appear in this output | ||
683 | 2126 | +--echo ##################################################################################### | ||
684 | 2127 | + | ||
685 | 2128 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
686 | 2129 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
687 | 2130 | +--exec $MYSQL_BINLOG --base64-output=decode-rows --skip-annotate-rows-events -v -v --read-from-remote-server --user=root --host=localhost --port=$MASTER_MYPORT master-bin.000001 | ||
688 | 2131 | + | ||
689 | 2132 | +# Clean-up | ||
690 | 2133 | + | ||
691 | 2134 | +--disable_query_log | ||
692 | 2135 | +DROP DATABASE test1; | ||
693 | 2136 | +DROP DATABASE test2; | ||
694 | 2137 | +DROP DATABASE test3; | ||
695 | 2138 | +DROP DATABASE xtest1; | ||
696 | 2139 | +DROP DATABASE xtest2; | ||
697 | 2140 | +--enable_query_log | ||
698 | 2141 | + | ||
699 | 2142 | --- /dev/null | 1497 | --- /dev/null |
700 | 2143 | +++ b/mysql-test/suite/rpl/r/percona_mixed_binlog_direct.result | 1498 | +++ b/mysql-test/suite/rpl/r/percona_mixed_binlog_direct.result |
701 | 2144 | @@ -0,0 +1,1462 @@ | 1499 | @@ -0,0 +1,1462 @@ |
702 | @@ -6285,17 +5640,6 @@ | |||
703 | 6285 | SELECT COUNT(*) FROM t1; | 5640 | SELECT COUNT(*) FROM t1; |
704 | 6286 | COUNT(*) | 5641 | COUNT(*) |
705 | 6287 | 0 | 5642 | 0 |
706 | 6288 | --- a/mysql-test/suite/rpl/r/rpl_row_conflicts.result | ||
707 | 6289 | +++ b/mysql-test/suite/rpl/r/rpl_row_conflicts.result | ||
708 | 6290 | @@ -21,7 +21,7 @@ | ||
709 | 6291 | [on slave] | ||
710 | 6292 | ---- Wait until slave stops with an error ---- | ||
711 | 6293 | include/wait_for_slave_sql_error.inc [errno=1062] | ||
712 | 6294 | -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) | ||
713 | 6295 | +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) | ||
714 | 6296 | call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.* Error_code: 1062"); | ||
715 | 6297 | SELECT * FROM t1; | ||
716 | 6298 | a | ||
717 | 6299 | --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result | 5643 | --- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result |
718 | 6300 | +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result | 5644 | +++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result |
719 | 6301 | @@ -117,17 +117,17 @@ | 5645 | @@ -117,17 +117,17 @@ |
720 | @@ -7426,47 +6770,6 @@ | |||
721 | 7426 | + | 6770 | + |
722 | 7427 | # END 5.1 Test Case | 6771 | # END 5.1 Test Case |
723 | 7428 | --source include/rpl_end.inc | 6772 | --source include/rpl_end.inc |
724 | 7429 | --- /dev/null | ||
725 | 7430 | +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont-slave.opt | ||
726 | 7431 | @@ -0,0 +1 @@ | ||
727 | 7432 | +--log-slave-updates --replicate-ignore-table=test1.xt1 --replicate-ignore-table=test1.xt2 | ||
728 | 7433 | \ No newline at end of file | ||
729 | 7434 | --- /dev/null | ||
730 | 7435 | +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test | ||
731 | 7436 | @@ -0,0 +1,9 @@ | ||
732 | 7437 | +############################################################################### | ||
733 | 7438 | +# WL47: Store in binlog text of statements that caused RBR events | ||
734 | 7439 | +# Wrapper for extra/rpl/rpl_row_annotate.test. | ||
735 | 7440 | +# Intended to test that if the --replicate-annotate-rows-events option | ||
736 | 7441 | +# is switched off on slave then Annotate_events are not reproduced. | ||
737 | 7442 | +############################################################################### | ||
738 | 7443 | + | ||
739 | 7444 | +--source include/have_binlog_format_row.inc | ||
740 | 7445 | +--source extra/rpl_tests/rpl_row_annotate.test | ||
741 | 7446 | --- /dev/null | ||
742 | 7447 | +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do-slave.opt | ||
743 | 7448 | @@ -0,0 +1 @@ | ||
744 | 7449 | +--log-slave-updates --replicate-annotate-rows-events --replicate-ignore-table=test1.xt1 --replicate-ignore-table=test1.xt2 | ||
745 | 7450 | \ No newline at end of file | ||
746 | 7451 | --- /dev/null | ||
747 | 7452 | +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do.test | ||
748 | 7453 | @@ -0,0 +1,16 @@ | ||
749 | 7454 | +############################################################################### | ||
750 | 7455 | +# WL47: Store in binlog text of statements that caused RBR events | ||
751 | 7456 | +# Wrapper for extra/rpl/rpl_row_annotate.test. | ||
752 | 7457 | +# Intended to test that if the --replicate-annotate-rows-events option | ||
753 | 7458 | +# is switched on on slave then Annotate_events: | ||
754 | 7459 | +# - are reproduced on slave | ||
755 | 7460 | +# - are reproduced only once for "multi-table-maps" rbr queries | ||
756 | 7461 | +# - are not reproduced when the corresponding queries are filtered away | ||
757 | 7462 | +# on replication | ||
758 | 7463 | +# - are reproduced when the corresponding queries are filtered away partialy | ||
759 | 7464 | +# (e.g. in case of multi-delete) | ||
760 | 7465 | +# - are not generated on slave for queries that are not annotated on master. | ||
761 | 7466 | +############################################################################### | ||
762 | 7467 | + | ||
763 | 7468 | +--source include/have_binlog_format_row.inc | ||
764 | 7469 | +--source extra/rpl_tests/rpl_row_annotate.test | ||
765 | 7470 | --- a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test | 6773 | --- a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test |
766 | 7471 | +++ b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test | 6774 | +++ b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test |
767 | 7472 | @@ -2,6 +2,8 @@ | 6775 | @@ -2,6 +2,8 @@ |
768 | @@ -7491,89 +6794,6 @@ | |||
769 | 7491 | --disable_warnings | 6794 | --disable_warnings |
770 | 7492 | DROP TABLE IF EXISTS t1; | 6795 | DROP TABLE IF EXISTS t1; |
771 | 7493 | --enable_warnings | 6796 | --enable_warnings |
772 | 7494 | --- a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test | ||
773 | 7495 | +++ b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test | ||
774 | 7496 | @@ -1,7 +1,8 @@ | ||
775 | 7497 | # depends on the binlog output | ||
776 | 7498 | -- source include/have_binlog_format_row.inc | ||
777 | 7499 | +--source include/binlog_start_pos.inc | ||
778 | 7500 | |||
779 | 7501 | -let $rename_event_pos= 897; | ||
780 | 7502 | +let $rename_event_pos= `select @binlog_start_pos + 791`; | ||
781 | 7503 | |||
782 | 7504 | # Bug#18326: Do not lock table for writing during prepare of statement | ||
783 | 7505 | # The use of the ps protocol causes extra table maps in the binlog, so | ||
784 | 7506 | --- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test | ||
785 | 7507 | +++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test | ||
786 | 7508 | @@ -162,15 +162,18 @@ | ||
787 | 7509 | |||
788 | 7510 | remove_file $MYSQLTEST_VARDIR/tmp/master.sql; | ||
789 | 7511 | |||
790 | 7512 | +--source include/binlog_start_pos.inc | ||
791 | 7513 | |||
792 | 7514 | # this test for position option | ||
793 | 7515 | -# By setting this position to 416, we should only get the create of t3 | ||
794 | 7516 | +# By setting this position to start_binlog_pos + 310, we should only get the create of t3 | ||
795 | 7517 | +let $start_pos= `select @binlog_start_pos + 310`; | ||
796 | 7518 | +let $stop_pos= `select @binlog_start_pos + 463`; | ||
797 | 7519 | --disable_query_log | ||
798 | 7520 | select "--- Test 2 position test --" as ""; | ||
799 | 7521 | --enable_query_log | ||
800 | 7522 | let $MYSQLD_DATADIR= `select @@datadir;`; | ||
801 | 7523 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
802 | 7524 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416 --stop-position=569 $MYSQLD_DATADIR/master-bin.000001 | ||
803 | 7525 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=$start_pos --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 | ||
804 | 7526 | |||
805 | 7527 | # These are tests for remote binlog. | ||
806 | 7528 | # They should return the same as previous test. | ||
807 | 7529 | @@ -181,7 +184,7 @@ | ||
808 | 7530 | |||
809 | 7531 | # This is broken now | ||
810 | 7532 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
811 | 7533 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --stop-position=569 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
812 | 7534 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
813 | 7535 | |||
814 | 7536 | # This part is disabled due to bug #17654 | ||
815 | 7537 | |||
816 | 7538 | @@ -257,7 +260,7 @@ | ||
817 | 7539 | select "--- Test 5 LOAD DATA --" as ""; | ||
818 | 7540 | --enable_query_log | ||
819 | 7541 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
820 | 7542 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --stop-position=106 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 | ||
821 | 7543 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --stop-position=$binlog_start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 | ||
822 | 7544 | |||
823 | 7545 | # Bug#7853 (mysqlbinlog does not accept input from stdin) | ||
824 | 7546 | |||
825 | 7547 | @@ -265,14 +268,17 @@ | ||
826 | 7548 | select "--- Test 6 reading stdin --" as ""; | ||
827 | 7549 | --enable_query_log | ||
828 | 7550 | let $MYSQLD_DATADIR= `select @@datadir;`; | ||
829 | 7551 | +let $stop_pos= `select @binlog_start_pos + 463`; | ||
830 | 7552 | --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR | ||
831 | 7553 | ---exec $MYSQL_BINLOG --short-form --stop-position=569 - < $MYSQLD_DATADIR/master-bin.000001 | ||
832 | 7554 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos - < $MYSQLD_DATADIR/master-bin.000001 | ||
833 | 7555 | |||
834 | 7556 | --disable_query_log | ||
835 | 7557 | select "--- Test 7 reading stdin w/position --" as ""; | ||
836 | 7558 | --enable_query_log | ||
837 | 7559 | +let $start_pos= `select @binlog_start_pos + 310`; | ||
838 | 7560 | +let $stop_pos= `select @binlog_start_pos + 463`; | ||
839 | 7561 | --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR | ||
840 | 7562 | ---exec $MYSQL_BINLOG --short-form --position=416 --stop-position=569 - < $MYSQLD_DATADIR/master-bin.000001 | ||
841 | 7563 | +--exec $MYSQL_BINLOG --short-form --position=$start_pos --stop-position=$stop_pos - < $MYSQLD_DATADIR/master-bin.000001 | ||
842 | 7564 | |||
843 | 7565 | # Bug#16217 (mysql client did not know how not switch its internal charset) | ||
844 | 7566 | --disable_query_log | ||
845 | 7567 | --- a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test | ||
846 | 7568 | +++ b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test | ||
847 | 7569 | @@ -1,5 +1,6 @@ | ||
848 | 7570 | # depends on the binlog output | ||
849 | 7571 | --source include/have_binlog_format_mixed_or_statement.inc | ||
850 | 7572 | +--source include/binlog_start_pos.inc | ||
851 | 7573 | |||
852 | 7574 | -let $rename_event_pos= 656; | ||
853 | 7575 | +let $rename_event_pos= `select @binlog_start_pos + 550`; | ||
854 | 7576 | -- source extra/rpl_tests/rpl_flsh_tbls.test | ||
855 | 7577 | --- /dev/null | 6797 | --- /dev/null |
856 | 7578 | +++ b/mysql-test/suite/rpl/t/rpl_typeconv.test | 6798 | +++ b/mysql-test/suite/rpl/t/rpl_typeconv.test |
857 | 7579 | @@ -0,0 +1,75 @@ | 6799 | @@ -0,0 +1,75 @@ |
858 | @@ -7652,436 +6872,6 @@ | |||
859 | 7652 | +set global slave_type_conversions = @saved_slave_type_conversions; | 6872 | +set global slave_type_conversions = @saved_slave_type_conversions; |
860 | 7653 | + | 6873 | + |
861 | 7654 | +source include/rpl_end.inc; | 6874 | +source include/rpl_end.inc; |
862 | 7655 | --- a/mysql-test/t/ctype_cp932_binlog_stm.test | ||
863 | 7656 | +++ b/mysql-test/t/ctype_cp932_binlog_stm.test | ||
864 | 7657 | @@ -28,16 +28,6 @@ | ||
865 | 7658 | |||
866 | 7659 | --echo End of 5.0 tests | ||
867 | 7660 | |||
868 | 7661 | -# | ||
869 | 7662 | -# #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump | ||
870 | 7663 | -# Note: 364 is a magic position (found experimentally, depends on | ||
871 | 7664 | -# the log's contents) that caused the server crash. | ||
872 | 7665 | - | ||
873 | 7666 | -call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49"); | ||
874 | 7667 | - | ||
875 | 7668 | ---error 1220 | ||
876 | 7669 | -SHOW BINLOG EVENTS FROM 365; | ||
877 | 7670 | - | ||
878 | 7671 | --echo Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment. | ||
879 | 7672 | CREATE TABLE t1 (a varchar(16)) character set cp932; | ||
880 | 7673 | INSERT INTO t1 VALUES (0x8372835E),(0x8352835E); | ||
881 | 7674 | --- a/mysql-test/t/mysqlbinlog2.test | ||
882 | 7675 | +++ b/mysql-test/t/mysqlbinlog2.test | ||
883 | 7676 | @@ -3,7 +3,7 @@ | ||
884 | 7677 | |||
885 | 7678 | # TODO: Need to look at making row based version once new binlog client is complete. | ||
886 | 7679 | -- source include/have_binlog_format_mixed_or_statement.inc | ||
887 | 7680 | - | ||
888 | 7681 | +-- source include/binlog_start_pos.inc | ||
889 | 7682 | |||
890 | 7683 | --disable_warnings | ||
891 | 7684 | drop table if exists t1; | ||
892 | 7685 | @@ -50,15 +50,19 @@ | ||
893 | 7686 | --disable_query_log | ||
894 | 7687 | select "--- start-position --" as ""; | ||
895 | 7688 | --enable_query_log | ||
896 | 7689 | ---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLD_DATADIR/master-bin.000001 | ||
897 | 7690 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
898 | 7691 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 | ||
899 | 7692 | --disable_query_log | ||
900 | 7693 | select "--- stop-position --" as ""; | ||
901 | 7694 | --enable_query_log | ||
902 | 7695 | ---exec $MYSQL_BINLOG --short-form --stop-position=608 $MYSQLD_DATADIR/master-bin.000001 | ||
903 | 7696 | +let $stop_pos= `select @binlog_start_pos + 502`; | ||
904 | 7697 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 | ||
905 | 7698 | --disable_query_log | ||
906 | 7699 | select "--- start and stop positions ---" as ""; | ||
907 | 7700 | --enable_query_log | ||
908 | 7701 | ---exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 $MYSQLD_DATADIR/master-bin.000001 | ||
909 | 7702 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
910 | 7703 | +let $stop_pos= `select @binlog_start_pos + 619`; | ||
911 | 7704 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position $stop_pos $MYSQLD_DATADIR/master-bin.000001 | ||
912 | 7705 | --disable_query_log | ||
913 | 7706 | select "--- start-datetime --" as ""; | ||
914 | 7707 | --enable_query_log | ||
915 | 7708 | @@ -84,11 +88,13 @@ | ||
916 | 7709 | --disable_query_log | ||
917 | 7710 | select "--- start-position --" as ""; | ||
918 | 7711 | --enable_query_log | ||
919 | 7712 | ---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 | ||
920 | 7713 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
921 | 7714 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 | ||
922 | 7715 | --disable_query_log | ||
923 | 7716 | select "--- stop-position --" as ""; | ||
924 | 7717 | --enable_query_log | ||
925 | 7718 | ---exec $MYSQL_BINLOG --short-form --stop-position=134 $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 | ||
926 | 7719 | +let $stop_pos= `select @binlog_start_pos + 28`; | ||
927 | 7720 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 | ||
928 | 7721 | --disable_query_log | ||
929 | 7722 | select "--- start-datetime --" as ""; | ||
930 | 7723 | --enable_query_log | ||
931 | 7724 | @@ -111,15 +117,19 @@ | ||
932 | 7725 | --disable_query_log | ||
933 | 7726 | select "--- start-position --" as ""; | ||
934 | 7727 | --enable_query_log | ||
935 | 7728 | ---exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
936 | 7729 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
937 | 7730 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
938 | 7731 | --disable_query_log | ||
939 | 7732 | select "--- stop-position --" as ""; | ||
940 | 7733 | --enable_query_log | ||
941 | 7734 | ---exec $MYSQL_BINLOG --short-form --stop-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
942 | 7735 | +let $stop_pos= `select @binlog_start_pos + 502`; | ||
943 | 7736 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
944 | 7737 | --disable_query_log | ||
945 | 7738 | select "--- start and stop positions ---" as ""; | ||
946 | 7739 | --enable_query_log | ||
947 | 7740 | ---exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
948 | 7741 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
949 | 7742 | +let $stop_pos= `select @binlog_start_pos + 619`; | ||
950 | 7743 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position $stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
951 | 7744 | --disable_query_log | ||
952 | 7745 | select "--- start-datetime --" as ""; | ||
953 | 7746 | --enable_query_log | ||
954 | 7747 | @@ -142,11 +152,13 @@ | ||
955 | 7748 | --disable_query_log | ||
956 | 7749 | select "--- start-position --" as ""; | ||
957 | 7750 | --enable_query_log | ||
958 | 7751 | ---exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 | ||
959 | 7752 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
960 | 7753 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 | ||
961 | 7754 | --disable_query_log | ||
962 | 7755 | select "--- stop-position --" as ""; | ||
963 | 7756 | --enable_query_log | ||
964 | 7757 | ---exec $MYSQL_BINLOG --short-form --stop-position=134 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 | ||
965 | 7758 | +let $stop_pos= `select @binlog_start_pos + 28`; | ||
966 | 7759 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 | ||
967 | 7760 | --disable_query_log | ||
968 | 7761 | select "--- start-datetime --" as ""; | ||
969 | 7762 | --enable_query_log | ||
970 | 7763 | --- a/mysql-test/t/mysqlbinlog-master.opt | ||
971 | 7764 | +++ b/mysql-test/t/mysqlbinlog-master.opt | ||
972 | 7765 | @@ -1,2 +1 @@ | ||
973 | 7766 | ---max-binlog-size=4096 | ||
974 | 7767 | --force-restart | ||
975 | 7768 | --- a/mysql-test/t/mysqlbinlog.test | ||
976 | 7769 | +++ b/mysql-test/t/mysqlbinlog.test | ||
977 | 7770 | @@ -3,10 +3,18 @@ | ||
978 | 7771 | -- source include/have_binlog_format_statement.inc | ||
979 | 7772 | |||
980 | 7773 | -- source include/have_log_bin.inc | ||
981 | 7774 | +-- source include/binlog_start_pos.inc | ||
982 | 7775 | |||
983 | 7776 | # Deletes all the binary logs | ||
984 | 7777 | reset master; | ||
985 | 7778 | |||
986 | 7779 | +# We need small binlog size to break the last LOAD DATA INFILE below so that | ||
987 | 7780 | +# the corresponding Begin_load_query will be written to master-bin.000001 | ||
988 | 7781 | +# while the Execute_load_query will be written to master-bin.000002. | ||
989 | 7782 | + | ||
990 | 7783 | +SET @save_binlog_size= @@global.max_binlog_size; | ||
991 | 7784 | +SET @@global.max_binlog_size= 4096; | ||
992 | 7785 | + | ||
993 | 7786 | # we need this for getting fixed timestamps inside of this test | ||
994 | 7787 | set timestamp=1000000000; | ||
995 | 7788 | |||
996 | 7789 | @@ -26,13 +34,15 @@ | ||
997 | 7790 | |||
998 | 7791 | # test for load data and load data distributed among the several | ||
999 | 7792 | # files (we need to fill up first binlog) | ||
1000 | 7793 | -load data infile '../../std_data/words.dat' into table t1; | ||
1001 | 7794 | -load data infile '../../std_data/words.dat' into table t1; | ||
1002 | 7795 | -load data infile '../../std_data/words.dat' into table t1; | ||
1003 | 7796 | -load data infile '../../std_data/words.dat' into table t1; | ||
1004 | 7797 | -load data infile '../../std_data/words.dat' into table t1; | ||
1005 | 7798 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1006 | 7799 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1007 | 7800 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1008 | 7801 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1009 | 7802 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1010 | 7803 | # simple query to show more in second binlog | ||
1011 | 7804 | insert into t1 values ("Alas"); | ||
1012 | 7805 | + | ||
1013 | 7806 | +### Starting master-bin.000003 | ||
1014 | 7807 | flush logs; | ||
1015 | 7808 | |||
1016 | 7809 | # delimiters are for easier debugging in future | ||
1017 | 7810 | @@ -46,7 +56,7 @@ | ||
1018 | 7811 | # | ||
1019 | 7812 | let $MYSQLD_DATADIR= `select @@datadir`; | ||
1020 | 7813 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1021 | 7814 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1022 | 7815 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1023 | 7816 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000001 | ||
1024 | 7817 | |||
1025 | 7818 | # this should not fail but shouldn't produce any working statements | ||
1026 | 7819 | @@ -54,7 +64,7 @@ | ||
1027 | 7820 | select "--- Broken LOAD DATA --" as ""; | ||
1028 | 7821 | --enable_query_log | ||
1029 | 7822 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1030 | 7823 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1031 | 7824 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1032 | 7825 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000002 2> /dev/null | ||
1033 | 7826 | |||
1034 | 7827 | # this should show almost nothing | ||
1035 | 7828 | @@ -62,17 +72,17 @@ | ||
1036 | 7829 | select "--- --database --" as ""; | ||
1037 | 7830 | --enable_query_log | ||
1038 | 7831 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1039 | 7832 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1040 | 7833 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1041 | 7834 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLD_DATADIR/master-bin.000001 2> /dev/null | ||
1042 | 7835 | |||
1043 | 7836 | # this test for position option | ||
1044 | 7837 | --disable_query_log | ||
1045 | 7838 | select "--- --position --" as ""; | ||
1046 | 7839 | --enable_query_log | ||
1047 | 7840 | +let $start_pos= `select @binlog_start_pos + 227`; | ||
1048 | 7841 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1049 | 7842 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1050 | 7843 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=332 $MYSQLD_DATADIR/master-bin.000002 | ||
1051 | 7844 | - | ||
1052 | 7845 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1053 | 7846 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=$start_pos $MYSQLD_DATADIR/master-bin.000002 | ||
1054 | 7847 | |||
1055 | 7848 | # These are tests for remote binlog. | ||
1056 | 7849 | # They should return the same as previous test. | ||
1057 | 7850 | @@ -83,7 +93,7 @@ | ||
1058 | 7851 | |||
1059 | 7852 | # This is broken now | ||
1060 | 7853 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1061 | 7854 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1062 | 7855 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1063 | 7856 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
1064 | 7857 | |||
1065 | 7858 | # This is broken too | ||
1066 | 7859 | @@ -91,7 +101,7 @@ | ||
1067 | 7860 | select "--- Broken LOAD DATA --" as ""; | ||
1068 | 7861 | --enable_query_log | ||
1069 | 7862 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1070 | 7863 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1071 | 7864 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1072 | 7865 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 2> /dev/null | ||
1073 | 7866 | |||
1074 | 7867 | # And this too ! (altough it is documented) | ||
1075 | 7868 | @@ -99,34 +109,39 @@ | ||
1076 | 7869 | select "--- --database --" as ""; | ||
1077 | 7870 | --enable_query_log | ||
1078 | 7871 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1079 | 7872 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1080 | 7873 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1081 | 7874 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001 2> /dev/null | ||
1082 | 7875 | |||
1083 | 7876 | # Strangely but this works | ||
1084 | 7877 | --disable_query_log | ||
1085 | 7878 | select "--- --position --" as ""; | ||
1086 | 7879 | --enable_query_log | ||
1087 | 7880 | +let $start_pos= `select @binlog_start_pos + 227`; | ||
1088 | 7881 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1089 | 7882 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1090 | 7883 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=332 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 | ||
1091 | 7884 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1092 | 7885 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=$start_pos --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 | ||
1093 | 7886 | |||
1094 | 7887 | # Bug#7853 mysqlbinlog does not accept input from stdin | ||
1095 | 7888 | --disable_query_log | ||
1096 | 7889 | select "--- reading stdin --" as ""; | ||
1097 | 7890 | --enable_query_log | ||
1098 | 7891 | --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR | ||
1099 | 7892 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1100 | 7893 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1101 | 7894 | --exec $MYSQL_BINLOG --short-form - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001 | ||
1102 | 7895 | |||
1103 | 7896 | --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR | ||
1104 | 7897 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1105 | 7898 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1106 | 7899 | --exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001 | ||
1107 | 7900 | drop table t1,t2; | ||
1108 | 7901 | |||
1109 | 7902 | +SET @@global.max_binlog_size= @save_binlog_size; | ||
1110 | 7903 | + | ||
1111 | 7904 | # | ||
1112 | 7905 | # Bug#14157 utf8 encoding in binlog without set character_set_client | ||
1113 | 7906 | # | ||
1114 | 7907 | +### Starting master-bin.000004 | ||
1115 | 7908 | flush logs; | ||
1116 | 7909 | + | ||
1117 | 7910 | --write_file $MYSQLTEST_VARDIR/tmp/bug14157.sql | ||
1118 | 7911 | create table if not exists t5 (a int); | ||
1119 | 7912 | set names latin1; | ||
1120 | 7913 | @@ -140,6 +155,8 @@ | ||
1121 | 7914 | # resulted binlog, parly consisting of multi-byte utf8 chars, | ||
1122 | 7915 | # must be digestable for both client and server. In 4.1 the client | ||
1123 | 7916 | # should use default-character-set same as the server. | ||
1124 | 7917 | + | ||
1125 | 7918 | +### Starting master-bin.000005 | ||
1126 | 7919 | flush logs; | ||
1127 | 7920 | --exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000004 | $MYSQL | ||
1128 | 7921 | select * from t5 /* must be (1),(1) */; | ||
1129 | 7922 | @@ -150,6 +167,8 @@ | ||
1130 | 7923 | # Check that a dump created by mysqlbinlog reproduces | ||
1131 | 7924 | # lc_time_names dependent values correctly | ||
1132 | 7925 | # | ||
1133 | 7926 | + | ||
1134 | 7927 | +### Starting master-bin.000006 | ||
1135 | 7928 | flush logs; | ||
1136 | 7929 | create table t5 (c1 int, c2 varchar(128) character set latin1 not null); | ||
1137 | 7930 | insert into t5 values (1, date_format('2001-01-01','%W')); | ||
1138 | 7931 | @@ -158,7 +177,10 @@ | ||
1139 | 7932 | set lc_time_names=en_US; | ||
1140 | 7933 | insert into t5 values (3, date_format('2001-01-01','%W')); | ||
1141 | 7934 | select * from t5 order by c1; | ||
1142 | 7935 | + | ||
1143 | 7936 | +### Starting master-bin.000007 | ||
1144 | 7937 | flush logs; | ||
1145 | 7938 | + | ||
1146 | 7939 | drop table t5; | ||
1147 | 7940 | --exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000006 | $MYSQL | ||
1148 | 7941 | select * from t5 order by c1; | ||
1149 | 7942 | @@ -170,7 +192,10 @@ | ||
1150 | 7943 | --disable_warnings | ||
1151 | 7944 | drop procedure if exists p1; | ||
1152 | 7945 | --enable_warnings | ||
1153 | 7946 | + | ||
1154 | 7947 | +### Starting master-bin.000008 | ||
1155 | 7948 | flush logs; | ||
1156 | 7949 | + | ||
1157 | 7950 | delimiter //; | ||
1158 | 7951 | create procedure p1() | ||
1159 | 7952 | begin | ||
1160 | 7953 | @@ -178,12 +203,15 @@ | ||
1161 | 7954 | end; | ||
1162 | 7955 | // | ||
1163 | 7956 | delimiter ;// | ||
1164 | 7957 | + | ||
1165 | 7958 | +### Starting master-bin.000009 | ||
1166 | 7959 | flush logs; | ||
1167 | 7960 | + | ||
1168 | 7961 | call p1(); | ||
1169 | 7962 | drop procedure p1; | ||
1170 | 7963 | --error ER_SP_DOES_NOT_EXIST | ||
1171 | 7964 | call p1(); | ||
1172 | 7965 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1173 | 7966 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1174 | 7967 | --exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000008 | ||
1175 | 7968 | --exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000008 | $MYSQL | ||
1176 | 7969 | call p1(); | ||
1177 | 7970 | @@ -202,7 +230,9 @@ | ||
1178 | 7971 | # (LOAD DATA INFILE need it) | ||
1179 | 7972 | # | ||
1180 | 7973 | |||
1181 | 7974 | +### Starting master-bin.000010 | ||
1182 | 7975 | flush logs; | ||
1183 | 7976 | + | ||
1184 | 7977 | create table t1 (a varchar(64) character set utf8); | ||
1185 | 7978 | load data infile '../../std_data/loaddata6.dat' into table t1; | ||
1186 | 7979 | set character_set_database=koi8r; | ||
1187 | 7980 | @@ -217,9 +247,12 @@ | ||
1188 | 7981 | load data infile '../../std_data/loaddata6.dat' into table t1 character set koi8r; | ||
1189 | 7982 | select hex(a) from t1; | ||
1190 | 7983 | drop table t1; | ||
1191 | 7984 | + | ||
1192 | 7985 | +### Starting master-bin.000011 | ||
1193 | 7986 | flush logs; | ||
1194 | 7987 | + | ||
1195 | 7988 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1196 | 7989 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
1197 | 7990 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
1198 | 7991 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000010 | ||
1199 | 7992 | |||
1200 | 7993 | # | ||
1201 | 7994 | @@ -229,9 +262,14 @@ | ||
1202 | 7995 | |||
1203 | 7996 | CREATE TABLE t1 (c1 CHAR(10)); | ||
1204 | 7997 | # we need this for getting fixed timestamps inside of this test | ||
1205 | 7998 | +### Starting master-bin.000012 | ||
1206 | 7999 | FLUSH LOGS; | ||
1207 | 8000 | + | ||
1208 | 8001 | INSERT INTO t1 VALUES ('0123456789'); | ||
1209 | 8002 | + | ||
1210 | 8003 | +### Starting master-bin.000013 | ||
1211 | 8004 | FLUSH LOGS; | ||
1212 | 8005 | + | ||
1213 | 8006 | DROP TABLE t1; | ||
1214 | 8007 | |||
1215 | 8008 | # We create a table, patch, and load the output into it | ||
1216 | 8009 | @@ -257,11 +295,16 @@ | ||
1217 | 8010 | # | ||
1218 | 8011 | # Bug#29928 incorrect connection_id() restoring from mysqlbinlog out | ||
1219 | 8012 | # | ||
1220 | 8013 | +### Starting master-bin.000014 | ||
1221 | 8014 | FLUSH LOGS; | ||
1222 | 8015 | + | ||
1223 | 8016 | CREATE TABLE t1(a INT); | ||
1224 | 8017 | INSERT INTO t1 VALUES(connection_id()); | ||
1225 | 8018 | let $a= `SELECT a FROM t1`; | ||
1226 | 8019 | + | ||
1227 | 8020 | +### Starting master-bin.000015 | ||
1228 | 8021 | FLUSH LOGS; | ||
1229 | 8022 | + | ||
1230 | 8023 | let $outfile= $MYSQLTEST_VARDIR/tmp/bug29928.sql; | ||
1231 | 8024 | --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000014 > $outfile | ||
1232 | 8025 | DROP TABLE t1; | ||
1233 | 8026 | @@ -281,11 +324,12 @@ | ||
1234 | 8027 | exec $MYSQL_BINLOG $MYSQL_TEST_DIR/std_data/corrupt-relay-bin.000624 > $MYSQLTEST_VARDIR/tmp/bug31793.sql; | ||
1235 | 8028 | --remove_file $MYSQLTEST_VARDIR/tmp/bug31793.sql | ||
1236 | 8029 | |||
1237 | 8030 | - | ||
1238 | 8031 | # | ||
1239 | 8032 | # Test --disable-force-if-open and --force-if-open | ||
1240 | 8033 | # | ||
1241 | 8034 | +### Starting master-bin.000016 | ||
1242 | 8035 | FLUSH LOGS; | ||
1243 | 8036 | + | ||
1244 | 8037 | --error 1 | ||
1245 | 8038 | --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000016 >/dev/null 2>/dev/null | ||
1246 | 8039 | --exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000016 >/dev/null 2>/dev/null | ||
1247 | 8040 | @@ -300,9 +344,15 @@ | ||
1248 | 8041 | SHOW GRANTS FOR untrusted@localhost; | ||
1249 | 8042 | USE mysqltest1; | ||
1250 | 8043 | CREATE TABLE t1 (a INT, b CHAR(64)); | ||
1251 | 8044 | + | ||
1252 | 8045 | +### Starting master-bin.000017 | ||
1253 | 8046 | flush logs; | ||
1254 | 8047 | + | ||
1255 | 8048 | INSERT INTO t1 VALUES (1,USER()); | ||
1256 | 8049 | + | ||
1257 | 8050 | +### Starting master-bin.000018 | ||
1258 | 8051 | flush logs; | ||
1259 | 8052 | + | ||
1260 | 8053 | echo mysqlbinlog var/log/master-bin.000017 > var/tmp/bug31611.sql; | ||
1261 | 8054 | exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000017 > $MYSQLTEST_VARDIR/tmp/bug31611.sql; | ||
1262 | 8055 | connect (unsecure,localhost,untrusted,,mysqltest1); | ||
1263 | 8056 | @@ -326,14 +376,20 @@ | ||
1264 | 8057 | connection default; | ||
1265 | 8058 | USE test; | ||
1266 | 8059 | SET BINLOG_FORMAT = STATEMENT; | ||
1267 | 8060 | + | ||
1268 | 8061 | +### Starting master-bin.000019 | ||
1269 | 8062 | FLUSH LOGS; | ||
1270 | 8063 | + | ||
1271 | 8064 | CREATE TABLE t1 (a_real FLOAT, an_int INT, a_decimal DECIMAL(5,2), a_string CHAR(32)); | ||
1272 | 8065 | SET @a_real = rand(20) * 1000; | ||
1273 | 8066 | SET @an_int = 1000; | ||
1274 | 8067 | SET @a_decimal = CAST(rand(19) * 999 AS DECIMAL(5,2)); | ||
1275 | 8068 | SET @a_string = 'Just a test'; | ||
1276 | 8069 | INSERT INTO t1 VALUES (@a_real, @an_int, @a_decimal, @a_string); | ||
1277 | 8070 | + | ||
1278 | 8071 | +### Starting master-bin.000020 | ||
1279 | 8072 | FLUSH LOGS; | ||
1280 | 8073 | + | ||
1281 | 8074 | query_vertical SELECT * FROM t1; | ||
1282 | 8075 | DROP TABLE t1; | ||
1283 | 8076 | |||
1284 | 8077 | @@ -357,6 +413,7 @@ | ||
1285 | 8078 | |||
1286 | 8079 | RESET MASTER; | ||
1287 | 8080 | FLUSH LOGS; | ||
1288 | 8081 | + | ||
1289 | 8082 | --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $binlog_file | ||
1290 | 8083 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1291 | 8084 | eval SELECT | ||
1292 | 8085 | --- /dev/null | 6875 | --- /dev/null |
1293 | 8086 | +++ b/mysql-test/t/percona_fast_alter_column.test | 6876 | +++ b/mysql-test/t/percona_fast_alter_column.test |
1294 | 8087 | @@ -0,0 +1,65 @@ | 6877 | @@ -0,0 +1,65 @@ |
1295 | @@ -8248,15 +7038,7 @@ | |||
1296 | 8248 | +DROP TABLE test; | 7038 | +DROP TABLE test; |
1297 | 8249 | --- a/mysql-test/r/percona_server_variables_debug.result | 7039 | --- a/mysql-test/r/percona_server_variables_debug.result |
1298 | 8250 | +++ b/mysql-test/r/percona_server_variables_debug.result | 7040 | +++ b/mysql-test/r/percona_server_variables_debug.result |
1308 | 8251 | @@ -7,6 +7,7 @@ | 7041 | @@ -102,6 +102,7 @@ |
1300 | 8252 | BACK_LOG | ||
1301 | 8253 | BASEDIR | ||
1302 | 8254 | BIG_TABLES | ||
1303 | 8255 | +BINLOG_ANNOTATE_ROWS_EVENTS | ||
1304 | 8256 | BINLOG_CACHE_SIZE | ||
1305 | 8257 | BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES | ||
1306 | 8258 | BINLOG_FORMAT | ||
1307 | 8259 | @@ -101,6 +102,7 @@ | ||
1309 | 8260 | INNODB_EXTRA_RSEGMENTS | 7042 | INNODB_EXTRA_RSEGMENTS |
1310 | 8261 | INNODB_EXTRA_UNDOSLOTS | 7043 | INNODB_EXTRA_UNDOSLOTS |
1311 | 8262 | INNODB_FAKE_CHANGES | 7044 | INNODB_FAKE_CHANGES |
1312 | @@ -8264,7 +7046,7 @@ | |||
1313 | 8264 | INNODB_FAST_CHECKSUM | 7046 | INNODB_FAST_CHECKSUM |
1314 | 8265 | INNODB_FAST_RECOVERY | 7047 | INNODB_FAST_RECOVERY |
1315 | 8266 | INNODB_FAST_SHUTDOWN | 7048 | INNODB_FAST_SHUTDOWN |
1317 | 8267 | @@ -201,6 +203,7 @@ | 7049 | @@ -202,6 +203,7 @@ |
1318 | 8268 | LOW_PRIORITY_UPDATES | 7050 | LOW_PRIORITY_UPDATES |
1319 | 8269 | MAX_ALLOWED_PACKET | 7051 | MAX_ALLOWED_PACKET |
1320 | 8270 | MAX_BINLOG_CACHE_SIZE | 7052 | MAX_BINLOG_CACHE_SIZE |
1321 | @@ -8272,16 +7054,15 @@ | |||
1322 | 8272 | MAX_BINLOG_SIZE | 7054 | MAX_BINLOG_SIZE |
1323 | 8273 | MAX_CONNECTIONS | 7055 | MAX_CONNECTIONS |
1324 | 8274 | MAX_CONNECT_ERRORS | 7056 | MAX_CONNECT_ERRORS |
1327 | 8275 | @@ -273,6 +276,8 @@ | 7057 | @@ -275,6 +277,7 @@ |
1326 | 8276 | RELAY_LOG_INFO_FILE | ||
1328 | 8277 | RELAY_LOG_PURGE | 7058 | RELAY_LOG_PURGE |
1329 | 8278 | RELAY_LOG_SPACE_LIMIT | 7059 | RELAY_LOG_SPACE_LIMIT |
1331 | 8279 | +REPLICATE_ANNOTATE_ROWS_EVENTS | 7060 | REPLICATE_ANNOTATE_ROWS_EVENTS |
1332 | 8280 | +REPLICATION_SLAVE_SKIP_COLUMNS | 7061 | +REPLICATION_SLAVE_SKIP_COLUMNS |
1333 | 8281 | REPORT_HOST | 7062 | REPORT_HOST |
1334 | 8282 | REPORT_PASSWORD | 7063 | REPORT_PASSWORD |
1335 | 8283 | REPORT_PORT | 7064 | REPORT_PORT |
1337 | 8284 | @@ -291,6 +296,8 @@ | 7065 | @@ -293,6 +296,8 @@ |
1338 | 8285 | SLAVE_NET_TIMEOUT | 7066 | SLAVE_NET_TIMEOUT |
1339 | 8286 | SLAVE_SKIP_ERRORS | 7067 | SLAVE_SKIP_ERRORS |
1340 | 8287 | SLAVE_TRANSACTION_RETRIES | 7068 | SLAVE_TRANSACTION_RETRIES |
1341 | @@ -8290,7 +7071,7 @@ | |||
1342 | 8290 | SLOW_LAUNCH_TIME | 7071 | SLOW_LAUNCH_TIME |
1343 | 8291 | SLOW_QUERY_LOG | 7072 | SLOW_QUERY_LOG |
1344 | 8292 | SLOW_QUERY_LOG_FILE | 7073 | SLOW_QUERY_LOG_FILE |
1346 | 8293 | @@ -312,6 +319,7 @@ | 7074 | @@ -314,6 +319,7 @@ |
1347 | 8294 | SQL_SAFE_UPDATES | 7075 | SQL_SAFE_UPDATES |
1348 | 8295 | SQL_SELECT_LIMIT | 7076 | SQL_SELECT_LIMIT |
1349 | 8296 | SQL_SLAVE_SKIP_COUNTER | 7077 | SQL_SLAVE_SKIP_COUNTER |
1350 | @@ -8300,15 +7081,7 @@ | |||
1351 | 8300 | SSL_CAPATH | 7081 | SSL_CAPATH |
1352 | 8301 | --- a/mysql-test/r/percona_server_variables_release.result | 7082 | --- a/mysql-test/r/percona_server_variables_release.result |
1353 | 8302 | +++ b/mysql-test/r/percona_server_variables_release.result | 7083 | +++ b/mysql-test/r/percona_server_variables_release.result |
1363 | 8303 | @@ -7,6 +7,7 @@ | 7084 | @@ -100,6 +100,7 @@ |
1355 | 8304 | BACK_LOG | ||
1356 | 8305 | BASEDIR | ||
1357 | 8306 | BIG_TABLES | ||
1358 | 8307 | +BINLOG_ANNOTATE_ROWS_EVENTS | ||
1359 | 8308 | BINLOG_CACHE_SIZE | ||
1360 | 8309 | BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES | ||
1361 | 8310 | BINLOG_FORMAT | ||
1362 | 8311 | @@ -99,6 +100,7 @@ | ||
1364 | 8312 | INNODB_EXTRA_RSEGMENTS | 7085 | INNODB_EXTRA_RSEGMENTS |
1365 | 8313 | INNODB_EXTRA_UNDOSLOTS | 7086 | INNODB_EXTRA_UNDOSLOTS |
1366 | 8314 | INNODB_FAKE_CHANGES | 7087 | INNODB_FAKE_CHANGES |
1367 | @@ -8316,7 +7089,7 @@ | |||
1368 | 8316 | INNODB_FAST_CHECKSUM | 7089 | INNODB_FAST_CHECKSUM |
1369 | 8317 | INNODB_FAST_RECOVERY | 7090 | INNODB_FAST_RECOVERY |
1370 | 8318 | INNODB_FAST_SHUTDOWN | 7091 | INNODB_FAST_SHUTDOWN |
1372 | 8319 | @@ -199,6 +201,7 @@ | 7092 | @@ -200,6 +201,7 @@ |
1373 | 8320 | LOW_PRIORITY_UPDATES | 7093 | LOW_PRIORITY_UPDATES |
1374 | 8321 | MAX_ALLOWED_PACKET | 7094 | MAX_ALLOWED_PACKET |
1375 | 8322 | MAX_BINLOG_CACHE_SIZE | 7095 | MAX_BINLOG_CACHE_SIZE |
1376 | @@ -8324,16 +7097,15 @@ | |||
1377 | 8324 | MAX_BINLOG_SIZE | 7097 | MAX_BINLOG_SIZE |
1378 | 8325 | MAX_CONNECTIONS | 7098 | MAX_CONNECTIONS |
1379 | 8326 | MAX_CONNECT_ERRORS | 7099 | MAX_CONNECT_ERRORS |
1382 | 8327 | @@ -270,6 +273,8 @@ | 7100 | @@ -272,6 +274,7 @@ |
1381 | 8328 | RELAY_LOG_INFO_FILE | ||
1383 | 8329 | RELAY_LOG_PURGE | 7101 | RELAY_LOG_PURGE |
1384 | 8330 | RELAY_LOG_SPACE_LIMIT | 7102 | RELAY_LOG_SPACE_LIMIT |
1386 | 8331 | +REPLICATE_ANNOTATE_ROWS_EVENTS | 7103 | REPLICATE_ANNOTATE_ROWS_EVENTS |
1387 | 8332 | +REPLICATION_SLAVE_SKIP_COLUMNS | 7104 | +REPLICATION_SLAVE_SKIP_COLUMNS |
1388 | 8333 | REPORT_HOST | 7105 | REPORT_HOST |
1389 | 8334 | REPORT_PASSWORD | 7106 | REPORT_PASSWORD |
1390 | 8335 | REPORT_PORT | 7107 | REPORT_PORT |
1392 | 8336 | @@ -288,6 +293,8 @@ | 7108 | @@ -290,6 +293,8 @@ |
1393 | 8337 | SLAVE_NET_TIMEOUT | 7109 | SLAVE_NET_TIMEOUT |
1394 | 8338 | SLAVE_SKIP_ERRORS | 7110 | SLAVE_SKIP_ERRORS |
1395 | 8339 | SLAVE_TRANSACTION_RETRIES | 7111 | SLAVE_TRANSACTION_RETRIES |
1396 | @@ -8342,7 +7114,7 @@ | |||
1397 | 8342 | SLOW_LAUNCH_TIME | 7114 | SLOW_LAUNCH_TIME |
1398 | 8343 | SLOW_QUERY_LOG | 7115 | SLOW_QUERY_LOG |
1399 | 8344 | SLOW_QUERY_LOG_FILE | 7116 | SLOW_QUERY_LOG_FILE |
1401 | 8345 | @@ -309,6 +316,7 @@ | 7117 | @@ -311,6 +316,7 @@ |
1402 | 8346 | SQL_SAFE_UPDATES | 7118 | SQL_SAFE_UPDATES |
1403 | 8347 | SQL_SELECT_LIMIT | 7119 | SQL_SELECT_LIMIT |
1404 | 8348 | SQL_SLAVE_SKIP_COUNTER | 7120 | SQL_SLAVE_SKIP_COUNTER |
1405 | 8349 | 7121 | ||
1406 | === modified file 'patches/wl47.patch' | |||
1407 | --- patches/wl47.patch 2012-01-31 08:05:03 +0000 | |||
1408 | +++ patches/wl47.patch 2012-02-13 03:48:59 +0000 | |||
1409 | @@ -96,7 +96,7 @@ | |||
1410 | 96 | static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info, | 96 | static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info, |
1411 | 97 | const char* logname); | 97 | const char* logname); |
1412 | 98 | static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info, | 98 | static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info, |
1414 | 99 | @@ -947,6 +1012,19 @@ | 99 | @@ -956,6 +1021,19 @@ |
1415 | 100 | my_free(fname, MYF(MY_WME)); | 100 | my_free(fname, MYF(MY_WME)); |
1416 | 101 | break; | 101 | break; |
1417 | 102 | } | 102 | } |
1418 | @@ -116,7 +116,7 @@ | |||
1419 | 116 | case TABLE_MAP_EVENT: | 116 | case TABLE_MAP_EVENT: |
1420 | 117 | { | 117 | { |
1421 | 118 | Table_map_log_event *map= ((Table_map_log_event *)ev); | 118 | Table_map_log_event *map= ((Table_map_log_event *)ev); |
1423 | 119 | @@ -956,5 +1034,12 @@ | 119 | @@ -965,6 +1043,13 @@ |
1424 | 120 | destroy_evt= FALSE; | 120 | destroy_evt= FALSE; |
1425 | 121 | goto end; | 121 | goto end; |
1426 | 122 | } | 122 | } |
1427 | @@ -129,7 +129,8 @@ | |||
1428 | 129 | + | 129 | + |
1429 | 130 | size_t len_to= 0; | 130 | size_t len_to= 0; |
1430 | 131 | const char* db_to= binlog_filter->get_rewrite_db(map->get_db_name(), | 131 | const char* db_to= binlog_filter->get_rewrite_db(map->get_db_name(), |
1432 | 132 | @@ -992,6 +1077,13 @@ | 132 | &len_to); |
1433 | 133 | @@ -1002,6 +1087,13 @@ | ||
1434 | 133 | if (print_event_info->m_table_map_ignored.count() > 0) | 134 | if (print_event_info->m_table_map_ignored.count() > 0) |
1435 | 134 | print_event_info->m_table_map_ignored.clear_tables(); | 135 | print_event_info->m_table_map_ignored.clear_tables(); |
1436 | 135 | 136 | ||
1437 | @@ -143,7 +144,7 @@ | |||
1438 | 143 | /* | 144 | /* |
1439 | 144 | One needs to take into account an event that gets | 145 | One needs to take into account an event that gets |
1440 | 145 | filtered but was last event in the statement. If this is | 146 | filtered but was last event in the statement. If this is |
1442 | 146 | @@ -1227,6 +1319,11 @@ | 147 | @@ -1239,6 +1331,11 @@ |
1443 | 147 | "Updates to a database with a different name than the original. \ | 148 | "Updates to a database with a different name than the original. \ |
1444 | 148 | Example: rewrite-db='from->to'.", | 149 | Example: rewrite-db='from->to'.", |
1445 | 149 | 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, | 150 | 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, |
1446 | @@ -155,7 +156,7 @@ | |||
1447 | 155 | {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} | 156 | {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} |
1448 | 156 | }; | 157 | }; |
1449 | 157 | 158 | ||
1451 | 158 | @@ -1695,6 +1792,8 @@ | 159 | @@ -1707,6 +1804,8 @@ |
1452 | 159 | cast to uint32. | 160 | cast to uint32. |
1453 | 160 | */ | 161 | */ |
1454 | 161 | int4store(buf, (uint32)start_position); | 162 | int4store(buf, (uint32)start_position); |
1455 | @@ -164,7 +165,7 @@ | |||
1456 | 164 | int2store(buf + BIN_LOG_HEADER_SIZE, binlog_flags); | 165 | int2store(buf + BIN_LOG_HEADER_SIZE, binlog_flags); |
1457 | 165 | 166 | ||
1458 | 166 | size_t tlen = strlen(logname); | 167 | size_t tlen = strlen(logname); |
1460 | 167 | @@ -1727,18 +1826,30 @@ | 168 | @@ -1739,18 +1838,30 @@ |
1461 | 168 | break; // end of data | 169 | break; // end of data |
1462 | 169 | DBUG_PRINT("info",( "len: %lu net->read_pos[5]: %d\n", | 170 | DBUG_PRINT("info",( "len: %lu net->read_pos[5]: %d\n", |
1463 | 170 | len, net->read_pos[5])); | 171 | len, net->read_pos[5])); |
1464 | @@ -206,7 +207,7 @@ | |||
1465 | 206 | 207 | ||
1466 | 207 | Log_event_type type= ev->get_type_code(); | 208 | Log_event_type type= ev->get_type_code(); |
1467 | 208 | if (glob_description_event->binlog_version >= 3 || | 209 | if (glob_description_event->binlog_version >= 3 || |
1469 | 209 | @@ -2247,6 +2358,7 @@ | 210 | @@ -2259,6 +2370,7 @@ |
1470 | 210 | if (result_file != stdout) | 211 | if (result_file != stdout) |
1471 | 211 | my_fclose(result_file, MYF(0)); | 212 | my_fclose(result_file, MYF(0)); |
1472 | 212 | cleanup(); | 213 | cleanup(); |
1473 | @@ -214,6 +215,2809 @@ | |||
1474 | 214 | delete binlog_filter; | 215 | delete binlog_filter; |
1475 | 215 | free_root(&s_mem_root, MYF(0)); | 216 | free_root(&s_mem_root, MYF(0)); |
1476 | 216 | free_defaults(defaults_argv); | 217 | free_defaults(defaults_argv); |
1477 | 218 | --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | ||
1478 | 219 | +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | ||
1479 | 220 | @@ -321,14 +321,19 @@ | ||
1480 | 221 | # we check that the error code of the "ROLLBACK" event is 0 and not | ||
1481 | 222 | # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction | ||
1482 | 223 | # and does not make slave to stop) | ||
1483 | 224 | + | ||
1484 | 225 | +-- source include/binlog_start_pos.inc | ||
1485 | 226 | + | ||
1486 | 227 | if (`select @@binlog_format = 'ROW'`) | ||
1487 | 228 | { | ||
1488 | 229 | - --exec $MYSQL_BINLOG --start-position=524 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output | ||
1489 | 230 | + let $start_pos= `select @binlog_start_pos + 418`; | ||
1490 | 231 | + --exec $MYSQL_BINLOG --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output | ||
1491 | 232 | } | ||
1492 | 233 | |||
1493 | 234 | if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`) | ||
1494 | 235 | { | ||
1495 | 236 | - --exec $MYSQL_BINLOG --start-position=555 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output | ||
1496 | 237 | + let $start_pos= `select @binlog_start_pos + 449`; | ||
1497 | 238 | + --exec $MYSQL_BINLOG --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output | ||
1498 | 239 | } | ||
1499 | 240 | |||
1500 | 241 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
1501 | 242 | --- a/mysql-test/extra/rpl_tests/rpl_log.test | ||
1502 | 243 | +++ b/mysql-test/extra/rpl_tests/rpl_log.test | ||
1503 | 244 | @@ -14,6 +14,7 @@ | ||
1504 | 245 | reset master; | ||
1505 | 246 | reset slave; | ||
1506 | 247 | source include/start_slave.inc; | ||
1507 | 248 | +source include/binlog_start_pos.inc; | ||
1508 | 249 | |||
1509 | 250 | let $VERSION=`select version()`; | ||
1510 | 251 | |||
1511 | 252 | --- /dev/null | ||
1512 | 253 | +++ b/mysql-test/extra/rpl_tests/rpl_row_annotate.test | ||
1513 | 254 | @@ -0,0 +1,156 @@ | ||
1514 | 255 | +######################################################################## | ||
1515 | 256 | +# WL47: Store in binlog text of statements that caused RBR events | ||
1516 | 257 | +# new event : ANNOTATE_ROWS_EVENT | ||
1517 | 258 | +# new master option : --binlog-annotate-rows-events | ||
1518 | 259 | +# new slave option : --replicate-annotate-rows-events | ||
1519 | 260 | +######################################################################## | ||
1520 | 261 | +--source include/master-slave.inc | ||
1521 | 262 | +connect (master2,127.0.0.1,root,,test,$MASTER_MYPORT,); | ||
1522 | 263 | + | ||
1523 | 264 | +connection master; | ||
1524 | 265 | +--disable_query_log | ||
1525 | 266 | + | ||
1526 | 267 | +--disable_warnings | ||
1527 | 268 | +DROP DATABASE IF EXISTS test1; | ||
1528 | 269 | +--enable_warnings | ||
1529 | 270 | + | ||
1530 | 271 | +CREATE DATABASE test1; | ||
1531 | 272 | +USE test1; | ||
1532 | 273 | + | ||
1533 | 274 | +CREATE TABLE t1(a int primary key, b int); | ||
1534 | 275 | +CREATE TABLE t2(a int, b int); | ||
1535 | 276 | +CREATE TABLE t3(a int, b int); | ||
1536 | 277 | +CREATE TABLE t4(a int, b int); | ||
1537 | 278 | +CREATE TABLE xt1(a int, b int); | ||
1538 | 279 | +CREATE TABLE xt2(a int, b int); | ||
1539 | 280 | + | ||
1540 | 281 | +CREATE TABLE t5 ( | ||
1541 | 282 | + a INT PRIMARY KEY AUTO_INCREMENT, | ||
1542 | 283 | + b VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_bin | ||
1543 | 284 | +); | ||
1544 | 285 | + | ||
1545 | 286 | +SET SESSION binlog_annotate_rows_events = OFF; | ||
1546 | 287 | + | ||
1547 | 288 | +INSERT INTO t1 VALUES (0,0), (1,1); | ||
1548 | 289 | + | ||
1549 | 290 | +SET SESSION binlog_annotate_rows_events = ON; | ||
1550 | 291 | + | ||
1551 | 292 | +UPDATE t1 SET b = b + 1; | ||
1552 | 293 | +REPLACE t1 VALUES (1,1), (2,2), (3,3); | ||
1553 | 294 | + | ||
1554 | 295 | +INSERT INTO t2 VALUES (1,1), (2,2), (3,3); | ||
1555 | 296 | +INSERT INTO t3 VALUES (1,1), (2,2), (3,3); | ||
1556 | 297 | +DELETE t1, t2 FROM t1 INNER JOIN t2 INNER JOIN t3 WHERE t1.a=t2.a AND t2.a=t3.a; | ||
1557 | 298 | + | ||
1558 | 299 | +INSERT INTO xt1 VALUES (1,1), (2,2), (3,3); | ||
1559 | 300 | +INSERT INTO t2 VALUES (1,1), (2,2), (3,3); | ||
1560 | 301 | +DELETE xt1, t2 FROM xt1 INNER JOIN t2 INNER JOIN t3 WHERE xt1.a=t2.a AND t2.a=t3.a; | ||
1561 | 302 | + | ||
1562 | 303 | +INSERT INTO xt1 VALUES (1,1), (2,2), (3,3); | ||
1563 | 304 | +INSERT INTO xt2 VALUES (1,1), (2,2), (3,3); | ||
1564 | 305 | +DELETE xt1, xt2 FROM xt1 INNER JOIN xt2 INNER JOIN t3 WHERE xt1.a=xt2.a AND xt2.a=t3.a; | ||
1565 | 306 | + | ||
1566 | 307 | +INSERT INTO t5(b) VALUES ('foo'), ('bar'), ('baz'); | ||
1567 | 308 | +SET NAMES latin1; | ||
1568 | 309 | +INSERT INTO t5(b) VALUES ('gås'); | ||
1569 | 310 | +SET NAMES utf8; | ||
1570 | 311 | +INSERT INTO t5(b) VALUES ('gås'); | ||
1571 | 312 | +SET NAMES latin1; | ||
1572 | 313 | + | ||
1573 | 314 | +FLUSH LOGS; | ||
1574 | 315 | + | ||
1575 | 316 | +--echo ######################################################################## | ||
1576 | 317 | +--echo # TABLES ON MASTER | ||
1577 | 318 | +--echo ######################################################################## | ||
1578 | 319 | +--enable_query_log | ||
1579 | 320 | + | ||
1580 | 321 | +SELECT * FROM t1 ORDER BY a; | ||
1581 | 322 | +SELECT * FROM t2 ORDER BY a; | ||
1582 | 323 | +SELECT * FROM t3 ORDER BY a; | ||
1583 | 324 | +SELECT * FROM t5 ORDER BY a; | ||
1584 | 325 | + | ||
1585 | 326 | +sync_slave_with_master; | ||
1586 | 327 | +--echo ######################################################################## | ||
1587 | 328 | +--echo # TABLES ON SLAVE: should be the same as on master | ||
1588 | 329 | +--echo ######################################################################## | ||
1589 | 330 | +--disable_query_log | ||
1590 | 331 | +USE test1; | ||
1591 | 332 | +--enable_query_log | ||
1592 | 333 | + | ||
1593 | 334 | +SELECT * FROM t1 ORDER BY a; | ||
1594 | 335 | +SELECT * FROM t2 ORDER BY a; | ||
1595 | 336 | +SELECT * FROM t3 ORDER BY a; | ||
1596 | 337 | +SELECT * FROM t5 ORDER BY a; | ||
1597 | 338 | + | ||
1598 | 339 | +--echo ######################################################################## | ||
1599 | 340 | +--echo # EVENTS ON SLAVE | ||
1600 | 341 | +let $annotate= `select @@global.replicate_annotate_rows_events`; | ||
1601 | 342 | +if ($annotate) | ||
1602 | 343 | +{ | ||
1603 | 344 | + --echo # The following Annotate_rows events should appear below: | ||
1604 | 345 | + --echo # - UPDATE t1 SET b = b + 1; | ||
1605 | 346 | + --echo # - REPLACE t1 VALUES (1,1), (2,2), (3,3); | ||
1606 | 347 | + --echo # - INSERT INTO t2 VALUES (1,1), (2,2), (3,3) | ||
1607 | 348 | + --echo # - INSERT INTO t3 VALUES (1,1), (2,2), (3,3) | ||
1608 | 349 | + --echo # - DELETE t1, t2 FROM <...> | ||
1609 | 350 | + --echo # - INSERT INTO t2 VALUES (1,1), (2,2), (3,3) | ||
1610 | 351 | + --echo # - DELETE xt1, t2 FROM <...> | ||
1611 | 352 | + --echo # - INSERT INTO t5(b) VALUES <...> (3 instances) | ||
1612 | 353 | +} | ||
1613 | 354 | +if (!$annotate) | ||
1614 | 355 | +{ | ||
1615 | 356 | + --echo # No Annotate_rows events should appear below | ||
1616 | 357 | +} | ||
1617 | 358 | +--echo ######################################################################## | ||
1618 | 359 | +FLUSH LOGS; | ||
1619 | 360 | + | ||
1620 | 361 | +--source include/binlog_start_pos.inc | ||
1621 | 362 | +let $start_pos= `select @binlog_start_pos`; | ||
1622 | 363 | +--replace_column 2 # 5 # | ||
1623 | 364 | +--replace_result $start_pos <start_pos> | ||
1624 | 365 | +--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// | ||
1625 | 366 | +--eval show binlog events in 'slave-bin.000001' from $start_pos | ||
1626 | 367 | + | ||
1627 | 368 | +--echo # | ||
1628 | 369 | +--echo ######################################################################## | ||
1629 | 370 | +--echo # INSERTs DELAYED ON MASTERs | ||
1630 | 371 | +--echo ######################################################################## | ||
1631 | 372 | +connection master; | ||
1632 | 373 | +SET SESSION binlog_annotate_rows_events = ON; | ||
1633 | 374 | +INSERT DELAYED INTO test1.t4 VALUES (1,1); | ||
1634 | 375 | +FLUSH TABLES; | ||
1635 | 376 | +SELECT * FROM test1.t4 ORDER BY a; | ||
1636 | 377 | + | ||
1637 | 378 | +sync_slave_with_master; | ||
1638 | 379 | +connection master; | ||
1639 | 380 | +sync_slave_with_master; | ||
1640 | 381 | + | ||
1641 | 382 | +--echo ######################################################################## | ||
1642 | 383 | +--echo # ON SLAVE | ||
1643 | 384 | +--echo # No Annotate_rows events should appear below | ||
1644 | 385 | +--echo ######################################################################## | ||
1645 | 386 | +FLUSH LOGS; | ||
1646 | 387 | + | ||
1647 | 388 | +--exec $MYSQL --host=127.0.0.1 --port=$SLAVE_MYPORT test -e "show binlog events in 'slave-bin.000002'" > $MYSQLTEST_VARDIR/tmp/annotated_events.txt | ||
1648 | 389 | +perl; | ||
1649 | 390 | + open F, '<', "$ENV{MYSQLTEST_VARDIR}/tmp/annotated_events.txt" or die; | ||
1650 | 391 | + binmode STDOUT; | ||
1651 | 392 | + while (defined ($_ = <F>)) { | ||
1652 | 393 | + if (/Annotate_rows/) { | ||
1653 | 394 | + s/[0-9]+\sAnnotate_rows\s[0-9]+\s[0-9]+/# Annotate_rows # #/; | ||
1654 | 395 | + print($_); | ||
1655 | 396 | + $_ = <F>; | ||
1656 | 397 | + s/[0-9]+\sTable_map\s[0-9]+\s[0-9]+\stable_id:\s[0-9]+/# Table_map # # table_id: #/; | ||
1657 | 398 | + print($_); | ||
1658 | 399 | + } | ||
1659 | 400 | + } | ||
1660 | 401 | +EOF | ||
1661 | 402 | + | ||
1662 | 403 | +# Clean-up | ||
1663 | 404 | +connection master; | ||
1664 | 405 | +--disable_query_log | ||
1665 | 406 | +DROP DATABASE test1; | ||
1666 | 407 | +sync_slave_with_master; | ||
1667 | 408 | +--enable_query_log | ||
1668 | 409 | + | ||
1669 | 410 | +--source include/rpl_end.inc | ||
1670 | 411 | --- /dev/null | ||
1671 | 412 | +++ b/mysql-test/include/binlog_start_pos.inc | ||
1672 | 413 | @@ -0,0 +1,26 @@ | ||
1673 | 414 | +############################################################################## | ||
1674 | 415 | +# | ||
1675 | 416 | +# binlog_start_pos is the postion of the the first event in the binary log | ||
1676 | 417 | +# which follows the Format description event. Intended to reduce test suite | ||
1677 | 418 | +# dependance on the Format description event length changes (e.g. in case | ||
1678 | 419 | +# of adding new events). Evaluated as: | ||
1679 | 420 | +# | ||
1680 | 421 | +# binlog_start_pos = 4 /* binlog header */ + | ||
1681 | 422 | +# (Format_description_log_event length) | ||
1682 | 423 | +# | ||
1683 | 424 | +# Format_description_log_event length = | ||
1684 | 425 | +# 19 /* event common header */ + | ||
1685 | 426 | +# 57 /* misc stuff in the Format description header */ + | ||
1686 | 427 | +# number of events. | ||
1687 | 428 | +# | ||
1688 | 429 | +# With current number of events = 160, | ||
1689 | 430 | +# | ||
1690 | 431 | +# binlog_start_pos = 4 + 19 + 57 + 160 = 240. | ||
1691 | 432 | +# | ||
1692 | 433 | +############################################################################## | ||
1693 | 434 | + | ||
1694 | 435 | +let $binlog_start_pos=240; | ||
1695 | 436 | +--disable_query_log | ||
1696 | 437 | +SET @binlog_start_pos=240; | ||
1697 | 438 | +--enable_query_log | ||
1698 | 439 | + | ||
1699 | 440 | --- a/mysql-test/include/show_binlog_events.inc | ||
1700 | 441 | +++ b/mysql-test/include/show_binlog_events.inc | ||
1701 | 442 | @@ -3,7 +3,7 @@ | ||
1702 | 443 | # | ||
1703 | 444 | # Useage: | ||
1704 | 445 | # let $binlog_file= master-bin.000002; | ||
1705 | 446 | -# let $binlog_start= 106; | ||
1706 | 447 | +# let $binlog_start= 240; | ||
1707 | 448 | # let $binlog_limit= 1, 3; | ||
1708 | 449 | # source include/show_binlog_events.inc; | ||
1709 | 450 | # | ||
1710 | 451 | --- a/mysql-test/include/show_binlog_events2.inc | ||
1711 | 452 | +++ b/mysql-test/include/show_binlog_events2.inc | ||
1712 | 453 | @@ -1,4 +1,4 @@ | ||
1713 | 454 | ---let $binlog_start=106 | ||
1714 | 455 | +--let $binlog_start=240 | ||
1715 | 456 | --replace_result $binlog_start <binlog_start> | ||
1716 | 457 | --replace_column 2 # 5 # | ||
1717 | 458 | --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ | ||
1718 | 459 | --- a/mysql-test/r/ctype_cp932_binlog_stm.result | ||
1719 | 460 | +++ b/mysql-test/r/ctype_cp932_binlog_stm.result | ||
1720 | 461 | @@ -44,9 +44,6 @@ | ||
1721 | 462 | master-bin.000001 # Query # # use `test`; DROP PROCEDURE bug18293 | ||
1722 | 463 | master-bin.000001 # Query # # use `test`; DROP TABLE t4 | ||
1723 | 464 | End of 5.0 tests | ||
1724 | 465 | -call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49"); | ||
1725 | 466 | -SHOW BINLOG EVENTS FROM 365; | ||
1726 | 467 | -ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error | ||
1727 | 468 | Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment. | ||
1728 | 469 | CREATE TABLE t1 (a varchar(16)) character set cp932; | ||
1729 | 470 | INSERT INTO t1 VALUES (0x8372835E),(0x8352835E); | ||
1730 | 471 | --- a/mysql-test/r/mysqlbinlog.result | ||
1731 | 472 | +++ b/mysql-test/r/mysqlbinlog.result | ||
1732 | 473 | @@ -1,15 +1,17 @@ | ||
1733 | 474 | reset master; | ||
1734 | 475 | +SET @save_binlog_size= @@global.max_binlog_size; | ||
1735 | 476 | +SET @@global.max_binlog_size= 4096; | ||
1736 | 477 | set timestamp=1000000000; | ||
1737 | 478 | drop table if exists t1,t2,t3,t4,t5,t03,t04; | ||
1738 | 479 | create table t1 (word varchar(20)); | ||
1739 | 480 | create table t2 (id int auto_increment not null primary key); | ||
1740 | 481 | insert into t1 values ("abirvalg"); | ||
1741 | 482 | insert into t2 values (); | ||
1742 | 483 | -load data infile '../../std_data/words.dat' into table t1; | ||
1743 | 484 | -load data infile '../../std_data/words.dat' into table t1; | ||
1744 | 485 | -load data infile '../../std_data/words.dat' into table t1; | ||
1745 | 486 | -load data infile '../../std_data/words.dat' into table t1; | ||
1746 | 487 | -load data infile '../../std_data/words.dat' into table t1; | ||
1747 | 488 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1748 | 489 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1749 | 490 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1750 | 491 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1751 | 492 | +load data infile '../../std_data/words3.dat' into table t1; | ||
1752 | 493 | insert into t1 values ("Alas"); | ||
1753 | 494 | flush logs; | ||
1754 | 495 | |||
1755 | 496 | @@ -255,6 +257,7 @@ | ||
1756 | 497 | ROLLBACK /* added by mysqlbinlog */; | ||
1757 | 498 | /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; | ||
1758 | 499 | drop table t1,t2; | ||
1759 | 500 | +SET @@global.max_binlog_size= @save_binlog_size; | ||
1760 | 501 | flush logs; | ||
1761 | 502 | flush logs; | ||
1762 | 503 | select * from t5 /* must be (1),(1) */; | ||
1763 | 504 | @@ -377,14 +380,14 @@ | ||
1764 | 505 | /*!*/; | ||
1765 | 506 | SET TIMESTAMP=1000000000/*!*/; | ||
1766 | 507 | SET @@session.collation_database=7/*!*/; | ||
1767 | 508 | -LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-a-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
1768 | 509 | +LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
1769 | 510 | /*!*/; | ||
1770 | 511 | SET TIMESTAMP=1000000000/*!*/; | ||
1771 | 512 | SET @@session.collation_database=DEFAULT/*!*/; | ||
1772 | 513 | -LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-b-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
1773 | 514 | +LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
1774 | 515 | /*!*/; | ||
1775 | 516 | SET TIMESTAMP=1000000000/*!*/; | ||
1776 | 517 | -LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-c-0' INTO TABLE `t1` CHARACTER SET koi8r FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
1777 | 518 | +LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` CHARACTER SET koi8r FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`) | ||
1778 | 519 | /*!*/; | ||
1779 | 520 | SET TIMESTAMP=1000000000/*!*/; | ||
1780 | 521 | drop table t1 | ||
1781 | 522 | --- a/mysql-test/r/percona_server_variables_debug.result | ||
1782 | 523 | +++ b/mysql-test/r/percona_server_variables_debug.result | ||
1783 | 524 | @@ -7,6 +7,7 @@ | ||
1784 | 525 | BACK_LOG | ||
1785 | 526 | BASEDIR | ||
1786 | 527 | BIG_TABLES | ||
1787 | 528 | +BINLOG_ANNOTATE_ROWS_EVENTS | ||
1788 | 529 | BINLOG_CACHE_SIZE | ||
1789 | 530 | BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES | ||
1790 | 531 | BINLOG_FORMAT | ||
1791 | 532 | @@ -273,6 +274,7 @@ | ||
1792 | 533 | RELAY_LOG_INFO_FILE | ||
1793 | 534 | RELAY_LOG_PURGE | ||
1794 | 535 | RELAY_LOG_SPACE_LIMIT | ||
1795 | 536 | +REPLICATE_ANNOTATE_ROWS_EVENTS | ||
1796 | 537 | REPORT_HOST | ||
1797 | 538 | REPORT_PASSWORD | ||
1798 | 539 | REPORT_PORT | ||
1799 | 540 | --- a/mysql-test/r/percona_server_variables_release.result | ||
1800 | 541 | +++ b/mysql-test/r/percona_server_variables_release.result | ||
1801 | 542 | @@ -7,6 +7,7 @@ | ||
1802 | 543 | BACK_LOG | ||
1803 | 544 | BASEDIR | ||
1804 | 545 | BIG_TABLES | ||
1805 | 546 | +BINLOG_ANNOTATE_ROWS_EVENTS | ||
1806 | 547 | BINLOG_CACHE_SIZE | ||
1807 | 548 | BINLOG_DIRECT_NON_TRANSACTIONAL_UPDATES | ||
1808 | 549 | BINLOG_FORMAT | ||
1809 | 550 | @@ -270,6 +271,7 @@ | ||
1810 | 551 | RELAY_LOG_INFO_FILE | ||
1811 | 552 | RELAY_LOG_PURGE | ||
1812 | 553 | RELAY_LOG_SPACE_LIMIT | ||
1813 | 554 | +REPLICATE_ANNOTATE_ROWS_EVENTS | ||
1814 | 555 | REPORT_HOST | ||
1815 | 556 | REPORT_PASSWORD | ||
1816 | 557 | REPORT_PORT | ||
1817 | 558 | --- /dev/null | ||
1818 | 559 | +++ b/mysql-test/std_data/words3.dat | ||
1819 | 560 | @@ -0,0 +1,66 @@ | ||
1820 | 561 | +Aarhus | ||
1821 | 562 | +Aaron | ||
1822 | 563 | +Ababa | ||
1823 | 564 | +aback | ||
1824 | 565 | +abaft | ||
1825 | 566 | +abandon | ||
1826 | 567 | +abandoned | ||
1827 | 568 | +abandoning | ||
1828 | 569 | +abandonment | ||
1829 | 570 | +abandons | ||
1830 | 571 | +Aarhus | ||
1831 | 572 | +Aaron | ||
1832 | 573 | +Ababa | ||
1833 | 574 | +aback | ||
1834 | 575 | +abaft | ||
1835 | 576 | +abandon | ||
1836 | 577 | +abandoned | ||
1837 | 578 | +abandoning | ||
1838 | 579 | +abandonment | ||
1839 | 580 | +abandons | ||
1840 | 581 | +abase | ||
1841 | 582 | +abased | ||
1842 | 583 | +abasement | ||
1843 | 584 | +abasements | ||
1844 | 585 | +abases | ||
1845 | 586 | +abash | ||
1846 | 587 | +abashed | ||
1847 | 588 | +abashes | ||
1848 | 589 | +abashing | ||
1849 | 590 | +abasing | ||
1850 | 591 | +abate | ||
1851 | 592 | +abated | ||
1852 | 593 | +abatement | ||
1853 | 594 | +abatements | ||
1854 | 595 | +abater | ||
1855 | 596 | +abates | ||
1856 | 597 | +abating | ||
1857 | 598 | +Abba | ||
1858 | 599 | +abbe | ||
1859 | 600 | +abbey | ||
1860 | 601 | +abbeys | ||
1861 | 602 | +abbot | ||
1862 | 603 | +abbots | ||
1863 | 604 | +Abbott | ||
1864 | 605 | +abbreviate | ||
1865 | 606 | +abbreviated | ||
1866 | 607 | +abbreviates | ||
1867 | 608 | +abbreviating | ||
1868 | 609 | +abbreviation | ||
1869 | 610 | +abbreviations | ||
1870 | 611 | +Abby | ||
1871 | 612 | +abdomen | ||
1872 | 613 | +abdomens | ||
1873 | 614 | +abdominal | ||
1874 | 615 | +abduct | ||
1875 | 616 | +abducted | ||
1876 | 617 | +abduction | ||
1877 | 618 | +abductions | ||
1878 | 619 | +abductor | ||
1879 | 620 | +abductors | ||
1880 | 621 | +abducts | ||
1881 | 622 | +Abe | ||
1882 | 623 | +abed | ||
1883 | 624 | +Abel | ||
1884 | 625 | +Abelian | ||
1885 | 626 | +Abelson | ||
1886 | 627 | --- /dev/null | ||
1887 | 628 | +++ b/mysql-test/suite/binlog/r/binlog_row_annotate.result | ||
1888 | 629 | @@ -0,0 +1,1219 @@ | ||
1889 | 630 | +##################################################################################### | ||
1890 | 631 | +# The following Annotate_rows events should appear below: | ||
1891 | 632 | +# - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
1892 | 633 | +# - INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
1893 | 634 | +# - DELETE test1.t1, test2.t2 FROM <...> | ||
1894 | 635 | +# - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
1895 | 636 | +# - DELETE xtest1.xt1, test2.t2 FROM <...> | ||
1896 | 637 | +##################################################################################### | ||
1897 | 638 | +show binlog events in 'master-bin.000001' from <start_pos>; | ||
1898 | 639 | +Log_name Pos Event_type Server_id End_log_pos Info | ||
1899 | 640 | +master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test1 | ||
1900 | 641 | +master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test2 | ||
1901 | 642 | +master-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test3 | ||
1902 | 643 | +master-bin.000001 # Query 1 # CREATE DATABASE test1 | ||
1903 | 644 | +master-bin.000001 # Query 1 # CREATE DATABASE test2 | ||
1904 | 645 | +master-bin.000001 # Query 1 # CREATE DATABASE test3 | ||
1905 | 646 | +master-bin.000001 # Query 1 # BEGIN | ||
1906 | 647 | +master-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
1907 | 648 | +master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
1908 | 649 | +master-bin.000001 # Query 1 # COMMIT | ||
1909 | 650 | +master-bin.000001 # Query 1 # BEGIN | ||
1910 | 651 | +master-bin.000001 # Annotate_rows 1 # INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
1911 | 652 | +master-bin.000001 # Table_map 1 # table_id: # (test2.t2) | ||
1912 | 653 | +master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
1913 | 654 | +master-bin.000001 # Query 1 # COMMIT | ||
1914 | 655 | +master-bin.000001 # Query 1 # BEGIN | ||
1915 | 656 | +master-bin.000001 # Annotate_rows 1 # INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
1916 | 657 | +master-bin.000001 # Table_map 1 # table_id: # (test3.t3) | ||
1917 | 658 | +master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
1918 | 659 | +master-bin.000001 # Query 1 # COMMIT | ||
1919 | 660 | +master-bin.000001 # Query 1 # BEGIN | ||
1920 | 661 | +master-bin.000001 # Annotate_rows 1 # DELETE test1.t1, test2.t2 | ||
1921 | 662 | +FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
1922 | 663 | +WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3.a | ||
1923 | 664 | +master-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
1924 | 665 | +master-bin.000001 # Table_map 1 # table_id: # (test2.t2) | ||
1925 | 666 | +master-bin.000001 # Delete_rows 1 # table_id: # | ||
1926 | 667 | +master-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F | ||
1927 | 668 | +master-bin.000001 # Query 1 # COMMIT | ||
1928 | 669 | +master-bin.000001 # Query 1 # BEGIN | ||
1929 | 670 | +master-bin.000001 # Annotate_rows 1 # INSERT INTO test2.v2 VALUES (1), (2), (3) | ||
1930 | 671 | +master-bin.000001 # Table_map 1 # table_id: # (test2.t2) | ||
1931 | 672 | +master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
1932 | 673 | +master-bin.000001 # Query 1 # COMMIT | ||
1933 | 674 | +master-bin.000001 # Query 1 # BEGIN | ||
1934 | 675 | +master-bin.000001 # Annotate_rows 1 # DELETE xtest1.xt1, test2.t2 | ||
1935 | 676 | +FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
1936 | 677 | +WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3.a | ||
1937 | 678 | +master-bin.000001 # Table_map 1 # table_id: # (test2.t2) | ||
1938 | 679 | +master-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F | ||
1939 | 680 | +master-bin.000001 # Query 1 # COMMIT | ||
1940 | 681 | +master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 | ||
1941 | 682 | +# | ||
1942 | 683 | +##################################################################################### | ||
1943 | 684 | +# mysqlbinlog | ||
1944 | 685 | +# The following Annotates should appear in this output: | ||
1945 | 686 | +# - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
1946 | 687 | +# - INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
1947 | 688 | +# - DELETE test1.t1, test2.t2 FROM <...> (with two subsequent Table maps) | ||
1948 | 689 | +# - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
1949 | 690 | +# - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map) | ||
1950 | 691 | +##################################################################################### | ||
1951 | 692 | +/*!40019 SET @@session.max_insert_delayed_threads=0*/; | ||
1952 | 693 | +/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; | ||
1953 | 694 | +DELIMITER /*!*/; | ||
1954 | 695 | +# at # | ||
1955 | 696 | +#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup | ||
1956 | 697 | +ROLLBACK/*!*/; | ||
1957 | 698 | +# at # | ||
1958 | 699 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
1959 | 700 | +SET TIMESTAMP=1000000000/*!*/; | ||
1960 | 701 | +SET @@session.pseudo_thread_id=#/*!*/; | ||
1961 | 702 | +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; | ||
1962 | 703 | +SET @@session.sql_mode=0/*!*/; | ||
1963 | 704 | +SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; | ||
1964 | 705 | +/*!\C latin1 *//*!*/; | ||
1965 | 706 | +SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; | ||
1966 | 707 | +SET @@session.lc_time_names=0/*!*/; | ||
1967 | 708 | +SET @@session.collation_database=DEFAULT/*!*/; | ||
1968 | 709 | +DROP DATABASE IF EXISTS test1 | ||
1969 | 710 | +/*!*/; | ||
1970 | 711 | +# at # | ||
1971 | 712 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
1972 | 713 | +SET TIMESTAMP=1000000000/*!*/; | ||
1973 | 714 | +DROP DATABASE IF EXISTS test2 | ||
1974 | 715 | +/*!*/; | ||
1975 | 716 | +# at # | ||
1976 | 717 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
1977 | 718 | +SET TIMESTAMP=1000000000/*!*/; | ||
1978 | 719 | +DROP DATABASE IF EXISTS test3 | ||
1979 | 720 | +/*!*/; | ||
1980 | 721 | +# at # | ||
1981 | 722 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
1982 | 723 | +SET TIMESTAMP=1000000000/*!*/; | ||
1983 | 724 | +CREATE DATABASE test1 | ||
1984 | 725 | +/*!*/; | ||
1985 | 726 | +# at # | ||
1986 | 727 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
1987 | 728 | +SET TIMESTAMP=1000000000/*!*/; | ||
1988 | 729 | +CREATE DATABASE test2 | ||
1989 | 730 | +/*!*/; | ||
1990 | 731 | +# at # | ||
1991 | 732 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
1992 | 733 | +SET TIMESTAMP=1000000000/*!*/; | ||
1993 | 734 | +CREATE DATABASE test3 | ||
1994 | 735 | +/*!*/; | ||
1995 | 736 | +# at # | ||
1996 | 737 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
1997 | 738 | +SET TIMESTAMP=1000000000/*!*/; | ||
1998 | 739 | +BEGIN | ||
1999 | 740 | +/*!*/; | ||
2000 | 741 | +# at # | ||
2001 | 742 | +# at # | ||
2002 | 743 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2003 | 744 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2004 | 745 | +### INSERT INTO test1.t1 | ||
2005 | 746 | +### SET | ||
2006 | 747 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2007 | 748 | +### INSERT INTO test1.t1 | ||
2008 | 749 | +### SET | ||
2009 | 750 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2010 | 751 | +### INSERT INTO test1.t1 | ||
2011 | 752 | +### SET | ||
2012 | 753 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2013 | 754 | +# at # | ||
2014 | 755 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2015 | 756 | +SET TIMESTAMP=1000000000/*!*/; | ||
2016 | 757 | +COMMIT | ||
2017 | 758 | +/*!*/; | ||
2018 | 759 | +# at # | ||
2019 | 760 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2020 | 761 | +SET TIMESTAMP=1000000000/*!*/; | ||
2021 | 762 | +BEGIN | ||
2022 | 763 | +/*!*/; | ||
2023 | 764 | +# at # | ||
2024 | 765 | +# at # | ||
2025 | 766 | +# at # | ||
2026 | 767 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2027 | 768 | +#Q> INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
2028 | 769 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2029 | 770 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2030 | 771 | +### INSERT INTO test2.t2 | ||
2031 | 772 | +### SET | ||
2032 | 773 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2033 | 774 | +### INSERT INTO test2.t2 | ||
2034 | 775 | +### SET | ||
2035 | 776 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2036 | 777 | +### INSERT INTO test2.t2 | ||
2037 | 778 | +### SET | ||
2038 | 779 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2039 | 780 | +# at # | ||
2040 | 781 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2041 | 782 | +SET TIMESTAMP=1000000000/*!*/; | ||
2042 | 783 | +COMMIT | ||
2043 | 784 | +/*!*/; | ||
2044 | 785 | +# at # | ||
2045 | 786 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2046 | 787 | +SET TIMESTAMP=1000000000/*!*/; | ||
2047 | 788 | +BEGIN | ||
2048 | 789 | +/*!*/; | ||
2049 | 790 | +# at # | ||
2050 | 791 | +# at # | ||
2051 | 792 | +# at # | ||
2052 | 793 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2053 | 794 | +#Q> INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
2054 | 795 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test3`.`t3` mapped to number # | ||
2055 | 796 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2056 | 797 | +### INSERT INTO test3.t3 | ||
2057 | 798 | +### SET | ||
2058 | 799 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2059 | 800 | +### INSERT INTO test3.t3 | ||
2060 | 801 | +### SET | ||
2061 | 802 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2062 | 803 | +### INSERT INTO test3.t3 | ||
2063 | 804 | +### SET | ||
2064 | 805 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2065 | 806 | +# at # | ||
2066 | 807 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2067 | 808 | +SET TIMESTAMP=1000000000/*!*/; | ||
2068 | 809 | +COMMIT | ||
2069 | 810 | +/*!*/; | ||
2070 | 811 | +# at # | ||
2071 | 812 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2072 | 813 | +SET TIMESTAMP=1000000000/*!*/; | ||
2073 | 814 | +BEGIN | ||
2074 | 815 | +/*!*/; | ||
2075 | 816 | +# at # | ||
2076 | 817 | +# at # | ||
2077 | 818 | +# at # | ||
2078 | 819 | +# at # | ||
2079 | 820 | +# at # | ||
2080 | 821 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2081 | 822 | +#Q> DELETE test1.t1, test2.t2 | ||
2082 | 823 | +#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
2083 | 824 | +#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3 | ||
2084 | 825 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2085 | 826 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2086 | 827 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # | ||
2087 | 828 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F | ||
2088 | 829 | +### DELETE FROM test1.t1 | ||
2089 | 830 | +### WHERE | ||
2090 | 831 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2091 | 832 | +### DELETE FROM test1.t1 | ||
2092 | 833 | +### WHERE | ||
2093 | 834 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2094 | 835 | +### DELETE FROM test1.t1 | ||
2095 | 836 | +### WHERE | ||
2096 | 837 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2097 | 838 | +### DELETE FROM test2.t2 | ||
2098 | 839 | +### WHERE | ||
2099 | 840 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2100 | 841 | +### DELETE FROM test2.t2 | ||
2101 | 842 | +### WHERE | ||
2102 | 843 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2103 | 844 | +### DELETE FROM test2.t2 | ||
2104 | 845 | +### WHERE | ||
2105 | 846 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2106 | 847 | +# at # | ||
2107 | 848 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2108 | 849 | +SET TIMESTAMP=1000000000/*!*/; | ||
2109 | 850 | +COMMIT | ||
2110 | 851 | +/*!*/; | ||
2111 | 852 | +# at # | ||
2112 | 853 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2113 | 854 | +SET TIMESTAMP=1000000000/*!*/; | ||
2114 | 855 | +BEGIN | ||
2115 | 856 | +/*!*/; | ||
2116 | 857 | +# at # | ||
2117 | 858 | +# at # | ||
2118 | 859 | +# at # | ||
2119 | 860 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2120 | 861 | +#Q> INSERT INTO test2.v2 VALUES (1), (2), (3) | ||
2121 | 862 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2122 | 863 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2123 | 864 | +### INSERT INTO test2.t2 | ||
2124 | 865 | +### SET | ||
2125 | 866 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2126 | 867 | +### INSERT INTO test2.t2 | ||
2127 | 868 | +### SET | ||
2128 | 869 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2129 | 870 | +### INSERT INTO test2.t2 | ||
2130 | 871 | +### SET | ||
2131 | 872 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2132 | 873 | +# at # | ||
2133 | 874 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2134 | 875 | +SET TIMESTAMP=1000000000/*!*/; | ||
2135 | 876 | +COMMIT | ||
2136 | 877 | +/*!*/; | ||
2137 | 878 | +# at # | ||
2138 | 879 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2139 | 880 | +SET TIMESTAMP=1000000000/*!*/; | ||
2140 | 881 | +BEGIN | ||
2141 | 882 | +/*!*/; | ||
2142 | 883 | +# at # | ||
2143 | 884 | +# at # | ||
2144 | 885 | +# at # | ||
2145 | 886 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2146 | 887 | +#Q> DELETE xtest1.xt1, test2.t2 | ||
2147 | 888 | +#Q> FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
2148 | 889 | +#Q> WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3 | ||
2149 | 890 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2150 | 891 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F | ||
2151 | 892 | +### DELETE FROM test2.t2 | ||
2152 | 893 | +### WHERE | ||
2153 | 894 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2154 | 895 | +### DELETE FROM test2.t2 | ||
2155 | 896 | +### WHERE | ||
2156 | 897 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2157 | 898 | +### DELETE FROM test2.t2 | ||
2158 | 899 | +### WHERE | ||
2159 | 900 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2160 | 901 | +# at # | ||
2161 | 902 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2162 | 903 | +SET TIMESTAMP=1000000000/*!*/; | ||
2163 | 904 | +COMMIT | ||
2164 | 905 | +/*!*/; | ||
2165 | 906 | +# at # | ||
2166 | 907 | +#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4 | ||
2167 | 908 | +DELIMITER ; | ||
2168 | 909 | +# End of log file | ||
2169 | 910 | +ROLLBACK /* added by mysqlbinlog */; | ||
2170 | 911 | +/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; | ||
2171 | 912 | +# | ||
2172 | 913 | +##################################################################################### | ||
2173 | 914 | +# mysqlbinlog --database=test1 | ||
2174 | 915 | +# The following Annotate should appear in this output: | ||
2175 | 916 | +# - DELETE test1.t1, test2.t2 FROM <...> | ||
2176 | 917 | +##################################################################################### | ||
2177 | 918 | +/*!40019 SET @@session.max_insert_delayed_threads=0*/; | ||
2178 | 919 | +/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; | ||
2179 | 920 | +DELIMITER /*!*/; | ||
2180 | 921 | +# at # | ||
2181 | 922 | +#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup | ||
2182 | 923 | +ROLLBACK/*!*/; | ||
2183 | 924 | +# at # | ||
2184 | 925 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2185 | 926 | +SET TIMESTAMP=1000000000/*!*/; | ||
2186 | 927 | +SET @@session.pseudo_thread_id=#/*!*/; | ||
2187 | 928 | +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; | ||
2188 | 929 | +SET @@session.sql_mode=0/*!*/; | ||
2189 | 930 | +SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; | ||
2190 | 931 | +/*!\C latin1 *//*!*/; | ||
2191 | 932 | +SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; | ||
2192 | 933 | +SET @@session.lc_time_names=0/*!*/; | ||
2193 | 934 | +SET @@session.collation_database=DEFAULT/*!*/; | ||
2194 | 935 | +DROP DATABASE IF EXISTS test1 | ||
2195 | 936 | +/*!*/; | ||
2196 | 937 | +# at # | ||
2197 | 938 | +# at # | ||
2198 | 939 | +# at # | ||
2199 | 940 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2200 | 941 | +SET TIMESTAMP=1000000000/*!*/; | ||
2201 | 942 | +CREATE DATABASE test1 | ||
2202 | 943 | +/*!*/; | ||
2203 | 944 | +# at # | ||
2204 | 945 | +# at # | ||
2205 | 946 | +# at # | ||
2206 | 947 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2207 | 948 | +SET TIMESTAMP=1000000000/*!*/; | ||
2208 | 949 | +BEGIN | ||
2209 | 950 | +/*!*/; | ||
2210 | 951 | +# at # | ||
2211 | 952 | +# at # | ||
2212 | 953 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2213 | 954 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2214 | 955 | +### INSERT INTO test1.t1 | ||
2215 | 956 | +### SET | ||
2216 | 957 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2217 | 958 | +### INSERT INTO test1.t1 | ||
2218 | 959 | +### SET | ||
2219 | 960 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2220 | 961 | +### INSERT INTO test1.t1 | ||
2221 | 962 | +### SET | ||
2222 | 963 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2223 | 964 | +# at # | ||
2224 | 965 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2225 | 966 | +SET TIMESTAMP=1000000000/*!*/; | ||
2226 | 967 | +COMMIT | ||
2227 | 968 | +/*!*/; | ||
2228 | 969 | +# at # | ||
2229 | 970 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2230 | 971 | +SET TIMESTAMP=1000000000/*!*/; | ||
2231 | 972 | +BEGIN | ||
2232 | 973 | +/*!*/; | ||
2233 | 974 | +# at # | ||
2234 | 975 | +# at # | ||
2235 | 976 | +# at # | ||
2236 | 977 | +# at # | ||
2237 | 978 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2238 | 979 | +SET TIMESTAMP=1000000000/*!*/; | ||
2239 | 980 | +COMMIT | ||
2240 | 981 | +/*!*/; | ||
2241 | 982 | +# at # | ||
2242 | 983 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2243 | 984 | +SET TIMESTAMP=1000000000/*!*/; | ||
2244 | 985 | +BEGIN | ||
2245 | 986 | +/*!*/; | ||
2246 | 987 | +# at # | ||
2247 | 988 | +# at # | ||
2248 | 989 | +# at # | ||
2249 | 990 | +# at # | ||
2250 | 991 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2251 | 992 | +SET TIMESTAMP=1000000000/*!*/; | ||
2252 | 993 | +COMMIT | ||
2253 | 994 | +/*!*/; | ||
2254 | 995 | +# at # | ||
2255 | 996 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2256 | 997 | +SET TIMESTAMP=1000000000/*!*/; | ||
2257 | 998 | +BEGIN | ||
2258 | 999 | +/*!*/; | ||
2259 | 1000 | +# at # | ||
2260 | 1001 | +# at # | ||
2261 | 1002 | +# at # | ||
2262 | 1003 | +# at # | ||
2263 | 1004 | +# at # | ||
2264 | 1005 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2265 | 1006 | +#Q> DELETE test1.t1, test2.t2 | ||
2266 | 1007 | +#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
2267 | 1008 | +#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3 | ||
2268 | 1009 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2269 | 1010 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # | ||
2270 | 1011 | +### DELETE FROM test1.t1 | ||
2271 | 1012 | +### WHERE | ||
2272 | 1013 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2273 | 1014 | +### DELETE FROM test1.t1 | ||
2274 | 1015 | +### WHERE | ||
2275 | 1016 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2276 | 1017 | +### DELETE FROM test1.t1 | ||
2277 | 1018 | +### WHERE | ||
2278 | 1019 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2279 | 1020 | +# at # | ||
2280 | 1021 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2281 | 1022 | +SET TIMESTAMP=1000000000/*!*/; | ||
2282 | 1023 | +COMMIT | ||
2283 | 1024 | +/*!*/; | ||
2284 | 1025 | +# at # | ||
2285 | 1026 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2286 | 1027 | +SET TIMESTAMP=1000000000/*!*/; | ||
2287 | 1028 | +BEGIN | ||
2288 | 1029 | +/*!*/; | ||
2289 | 1030 | +# at # | ||
2290 | 1031 | +# at # | ||
2291 | 1032 | +# at # | ||
2292 | 1033 | +# at # | ||
2293 | 1034 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2294 | 1035 | +SET TIMESTAMP=1000000000/*!*/; | ||
2295 | 1036 | +COMMIT | ||
2296 | 1037 | +/*!*/; | ||
2297 | 1038 | +# at # | ||
2298 | 1039 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2299 | 1040 | +SET TIMESTAMP=1000000000/*!*/; | ||
2300 | 1041 | +BEGIN | ||
2301 | 1042 | +/*!*/; | ||
2302 | 1043 | +# at # | ||
2303 | 1044 | +# at # | ||
2304 | 1045 | +# at # | ||
2305 | 1046 | +# at # | ||
2306 | 1047 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2307 | 1048 | +SET TIMESTAMP=1000000000/*!*/; | ||
2308 | 1049 | +COMMIT | ||
2309 | 1050 | +/*!*/; | ||
2310 | 1051 | +# at # | ||
2311 | 1052 | +#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4 | ||
2312 | 1053 | +DELIMITER ; | ||
2313 | 1054 | +# End of log file | ||
2314 | 1055 | +ROLLBACK /* added by mysqlbinlog */; | ||
2315 | 1056 | +/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; | ||
2316 | 1057 | +# | ||
2317 | 1058 | +##################################################################################### | ||
2318 | 1059 | +# mysqlbinlog --skip-annotate-rows-events | ||
2319 | 1060 | +# No Annotates should appear in this output | ||
2320 | 1061 | +##################################################################################### | ||
2321 | 1062 | +/*!40019 SET @@session.max_insert_delayed_threads=0*/; | ||
2322 | 1063 | +/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; | ||
2323 | 1064 | +DELIMITER /*!*/; | ||
2324 | 1065 | +# at # | ||
2325 | 1066 | +#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup | ||
2326 | 1067 | +ROLLBACK/*!*/; | ||
2327 | 1068 | +# at # | ||
2328 | 1069 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2329 | 1070 | +SET TIMESTAMP=1000000000/*!*/; | ||
2330 | 1071 | +SET @@session.pseudo_thread_id=#/*!*/; | ||
2331 | 1072 | +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; | ||
2332 | 1073 | +SET @@session.sql_mode=0/*!*/; | ||
2333 | 1074 | +SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; | ||
2334 | 1075 | +/*!\C latin1 *//*!*/; | ||
2335 | 1076 | +SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; | ||
2336 | 1077 | +SET @@session.lc_time_names=0/*!*/; | ||
2337 | 1078 | +SET @@session.collation_database=DEFAULT/*!*/; | ||
2338 | 1079 | +DROP DATABASE IF EXISTS test1 | ||
2339 | 1080 | +/*!*/; | ||
2340 | 1081 | +# at # | ||
2341 | 1082 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2342 | 1083 | +SET TIMESTAMP=1000000000/*!*/; | ||
2343 | 1084 | +DROP DATABASE IF EXISTS test2 | ||
2344 | 1085 | +/*!*/; | ||
2345 | 1086 | +# at # | ||
2346 | 1087 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2347 | 1088 | +SET TIMESTAMP=1000000000/*!*/; | ||
2348 | 1089 | +DROP DATABASE IF EXISTS test3 | ||
2349 | 1090 | +/*!*/; | ||
2350 | 1091 | +# at # | ||
2351 | 1092 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2352 | 1093 | +SET TIMESTAMP=1000000000/*!*/; | ||
2353 | 1094 | +CREATE DATABASE test1 | ||
2354 | 1095 | +/*!*/; | ||
2355 | 1096 | +# at # | ||
2356 | 1097 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2357 | 1098 | +SET TIMESTAMP=1000000000/*!*/; | ||
2358 | 1099 | +CREATE DATABASE test2 | ||
2359 | 1100 | +/*!*/; | ||
2360 | 1101 | +# at # | ||
2361 | 1102 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2362 | 1103 | +SET TIMESTAMP=1000000000/*!*/; | ||
2363 | 1104 | +CREATE DATABASE test3 | ||
2364 | 1105 | +/*!*/; | ||
2365 | 1106 | +# at # | ||
2366 | 1107 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2367 | 1108 | +SET TIMESTAMP=1000000000/*!*/; | ||
2368 | 1109 | +BEGIN | ||
2369 | 1110 | +/*!*/; | ||
2370 | 1111 | +# at # | ||
2371 | 1112 | +# at # | ||
2372 | 1113 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2373 | 1114 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2374 | 1115 | +### INSERT INTO test1.t1 | ||
2375 | 1116 | +### SET | ||
2376 | 1117 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2377 | 1118 | +### INSERT INTO test1.t1 | ||
2378 | 1119 | +### SET | ||
2379 | 1120 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2380 | 1121 | +### INSERT INTO test1.t1 | ||
2381 | 1122 | +### SET | ||
2382 | 1123 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2383 | 1124 | +# at # | ||
2384 | 1125 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2385 | 1126 | +SET TIMESTAMP=1000000000/*!*/; | ||
2386 | 1127 | +COMMIT | ||
2387 | 1128 | +/*!*/; | ||
2388 | 1129 | +# at # | ||
2389 | 1130 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2390 | 1131 | +SET TIMESTAMP=1000000000/*!*/; | ||
2391 | 1132 | +BEGIN | ||
2392 | 1133 | +/*!*/; | ||
2393 | 1134 | +# at # | ||
2394 | 1135 | +# at # | ||
2395 | 1136 | +# at # | ||
2396 | 1137 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2397 | 1138 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2398 | 1139 | +### INSERT INTO test2.t2 | ||
2399 | 1140 | +### SET | ||
2400 | 1141 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2401 | 1142 | +### INSERT INTO test2.t2 | ||
2402 | 1143 | +### SET | ||
2403 | 1144 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2404 | 1145 | +### INSERT INTO test2.t2 | ||
2405 | 1146 | +### SET | ||
2406 | 1147 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2407 | 1148 | +# at # | ||
2408 | 1149 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2409 | 1150 | +SET TIMESTAMP=1000000000/*!*/; | ||
2410 | 1151 | +COMMIT | ||
2411 | 1152 | +/*!*/; | ||
2412 | 1153 | +# at # | ||
2413 | 1154 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2414 | 1155 | +SET TIMESTAMP=1000000000/*!*/; | ||
2415 | 1156 | +BEGIN | ||
2416 | 1157 | +/*!*/; | ||
2417 | 1158 | +# at # | ||
2418 | 1159 | +# at # | ||
2419 | 1160 | +# at # | ||
2420 | 1161 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test3`.`t3` mapped to number # | ||
2421 | 1162 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2422 | 1163 | +### INSERT INTO test3.t3 | ||
2423 | 1164 | +### SET | ||
2424 | 1165 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2425 | 1166 | +### INSERT INTO test3.t3 | ||
2426 | 1167 | +### SET | ||
2427 | 1168 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2428 | 1169 | +### INSERT INTO test3.t3 | ||
2429 | 1170 | +### SET | ||
2430 | 1171 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2431 | 1172 | +# at # | ||
2432 | 1173 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2433 | 1174 | +SET TIMESTAMP=1000000000/*!*/; | ||
2434 | 1175 | +COMMIT | ||
2435 | 1176 | +/*!*/; | ||
2436 | 1177 | +# at # | ||
2437 | 1178 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2438 | 1179 | +SET TIMESTAMP=1000000000/*!*/; | ||
2439 | 1180 | +BEGIN | ||
2440 | 1181 | +/*!*/; | ||
2441 | 1182 | +# at # | ||
2442 | 1183 | +# at # | ||
2443 | 1184 | +# at # | ||
2444 | 1185 | +# at # | ||
2445 | 1186 | +# at # | ||
2446 | 1187 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2447 | 1188 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2448 | 1189 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # | ||
2449 | 1190 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F | ||
2450 | 1191 | +### DELETE FROM test1.t1 | ||
2451 | 1192 | +### WHERE | ||
2452 | 1193 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2453 | 1194 | +### DELETE FROM test1.t1 | ||
2454 | 1195 | +### WHERE | ||
2455 | 1196 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2456 | 1197 | +### DELETE FROM test1.t1 | ||
2457 | 1198 | +### WHERE | ||
2458 | 1199 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2459 | 1200 | +### DELETE FROM test2.t2 | ||
2460 | 1201 | +### WHERE | ||
2461 | 1202 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2462 | 1203 | +### DELETE FROM test2.t2 | ||
2463 | 1204 | +### WHERE | ||
2464 | 1205 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2465 | 1206 | +### DELETE FROM test2.t2 | ||
2466 | 1207 | +### WHERE | ||
2467 | 1208 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2468 | 1209 | +# at # | ||
2469 | 1210 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2470 | 1211 | +SET TIMESTAMP=1000000000/*!*/; | ||
2471 | 1212 | +COMMIT | ||
2472 | 1213 | +/*!*/; | ||
2473 | 1214 | +# at # | ||
2474 | 1215 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2475 | 1216 | +SET TIMESTAMP=1000000000/*!*/; | ||
2476 | 1217 | +BEGIN | ||
2477 | 1218 | +/*!*/; | ||
2478 | 1219 | +# at # | ||
2479 | 1220 | +# at # | ||
2480 | 1221 | +# at # | ||
2481 | 1222 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2482 | 1223 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2483 | 1224 | +### INSERT INTO test2.t2 | ||
2484 | 1225 | +### SET | ||
2485 | 1226 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2486 | 1227 | +### INSERT INTO test2.t2 | ||
2487 | 1228 | +### SET | ||
2488 | 1229 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2489 | 1230 | +### INSERT INTO test2.t2 | ||
2490 | 1231 | +### SET | ||
2491 | 1232 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2492 | 1233 | +# at # | ||
2493 | 1234 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2494 | 1235 | +SET TIMESTAMP=1000000000/*!*/; | ||
2495 | 1236 | +COMMIT | ||
2496 | 1237 | +/*!*/; | ||
2497 | 1238 | +# at # | ||
2498 | 1239 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2499 | 1240 | +SET TIMESTAMP=1000000000/*!*/; | ||
2500 | 1241 | +BEGIN | ||
2501 | 1242 | +/*!*/; | ||
2502 | 1243 | +# at # | ||
2503 | 1244 | +# at # | ||
2504 | 1245 | +# at # | ||
2505 | 1246 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2506 | 1247 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F | ||
2507 | 1248 | +### DELETE FROM test2.t2 | ||
2508 | 1249 | +### WHERE | ||
2509 | 1250 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2510 | 1251 | +### DELETE FROM test2.t2 | ||
2511 | 1252 | +### WHERE | ||
2512 | 1253 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2513 | 1254 | +### DELETE FROM test2.t2 | ||
2514 | 1255 | +### WHERE | ||
2515 | 1256 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2516 | 1257 | +# at # | ||
2517 | 1258 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2518 | 1259 | +SET TIMESTAMP=1000000000/*!*/; | ||
2519 | 1260 | +COMMIT | ||
2520 | 1261 | +/*!*/; | ||
2521 | 1262 | +# at # | ||
2522 | 1263 | +#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4 | ||
2523 | 1264 | +DELIMITER ; | ||
2524 | 1265 | +# End of log file | ||
2525 | 1266 | +ROLLBACK /* added by mysqlbinlog */; | ||
2526 | 1267 | +/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; | ||
2527 | 1268 | +# | ||
2528 | 1269 | +##################################################################################### | ||
2529 | 1270 | +# mysqlbinlog --read-from-remote-server | ||
2530 | 1271 | +# The following Annotates should appear in this output: | ||
2531 | 1272 | +# - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
2532 | 1273 | +# - INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
2533 | 1274 | +# - DELETE test1.t1, test2.t2 FROM <...> (with two subsequent Table maps) | ||
2534 | 1275 | +# - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
2535 | 1276 | +# - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map) | ||
2536 | 1277 | +##################################################################################### | ||
2537 | 1278 | +/*!40019 SET @@session.max_insert_delayed_threads=0*/; | ||
2538 | 1279 | +/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; | ||
2539 | 1280 | +DELIMITER /*!*/; | ||
2540 | 1281 | +# at # | ||
2541 | 1282 | +#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup | ||
2542 | 1283 | +ROLLBACK/*!*/; | ||
2543 | 1284 | +# at # | ||
2544 | 1285 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2545 | 1286 | +SET TIMESTAMP=1000000000/*!*/; | ||
2546 | 1287 | +SET @@session.pseudo_thread_id=#/*!*/; | ||
2547 | 1288 | +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; | ||
2548 | 1289 | +SET @@session.sql_mode=0/*!*/; | ||
2549 | 1290 | +SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; | ||
2550 | 1291 | +/*!\C latin1 *//*!*/; | ||
2551 | 1292 | +SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; | ||
2552 | 1293 | +SET @@session.lc_time_names=0/*!*/; | ||
2553 | 1294 | +SET @@session.collation_database=DEFAULT/*!*/; | ||
2554 | 1295 | +DROP DATABASE IF EXISTS test1 | ||
2555 | 1296 | +/*!*/; | ||
2556 | 1297 | +# at # | ||
2557 | 1298 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2558 | 1299 | +SET TIMESTAMP=1000000000/*!*/; | ||
2559 | 1300 | +DROP DATABASE IF EXISTS test2 | ||
2560 | 1301 | +/*!*/; | ||
2561 | 1302 | +# at # | ||
2562 | 1303 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2563 | 1304 | +SET TIMESTAMP=1000000000/*!*/; | ||
2564 | 1305 | +DROP DATABASE IF EXISTS test3 | ||
2565 | 1306 | +/*!*/; | ||
2566 | 1307 | +# at # | ||
2567 | 1308 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2568 | 1309 | +SET TIMESTAMP=1000000000/*!*/; | ||
2569 | 1310 | +CREATE DATABASE test1 | ||
2570 | 1311 | +/*!*/; | ||
2571 | 1312 | +# at # | ||
2572 | 1313 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2573 | 1314 | +SET TIMESTAMP=1000000000/*!*/; | ||
2574 | 1315 | +CREATE DATABASE test2 | ||
2575 | 1316 | +/*!*/; | ||
2576 | 1317 | +# at # | ||
2577 | 1318 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2578 | 1319 | +SET TIMESTAMP=1000000000/*!*/; | ||
2579 | 1320 | +CREATE DATABASE test3 | ||
2580 | 1321 | +/*!*/; | ||
2581 | 1322 | +# at # | ||
2582 | 1323 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2583 | 1324 | +SET TIMESTAMP=1000000000/*!*/; | ||
2584 | 1325 | +BEGIN | ||
2585 | 1326 | +/*!*/; | ||
2586 | 1327 | +# at # | ||
2587 | 1328 | +# at # | ||
2588 | 1329 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2589 | 1330 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2590 | 1331 | +### INSERT INTO test1.t1 | ||
2591 | 1332 | +### SET | ||
2592 | 1333 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2593 | 1334 | +### INSERT INTO test1.t1 | ||
2594 | 1335 | +### SET | ||
2595 | 1336 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2596 | 1337 | +### INSERT INTO test1.t1 | ||
2597 | 1338 | +### SET | ||
2598 | 1339 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2599 | 1340 | +# at # | ||
2600 | 1341 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2601 | 1342 | +SET TIMESTAMP=1000000000/*!*/; | ||
2602 | 1343 | +COMMIT | ||
2603 | 1344 | +/*!*/; | ||
2604 | 1345 | +# at # | ||
2605 | 1346 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2606 | 1347 | +SET TIMESTAMP=1000000000/*!*/; | ||
2607 | 1348 | +BEGIN | ||
2608 | 1349 | +/*!*/; | ||
2609 | 1350 | +# at # | ||
2610 | 1351 | +# at # | ||
2611 | 1352 | +# at # | ||
2612 | 1353 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2613 | 1354 | +#Q> INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
2614 | 1355 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2615 | 1356 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2616 | 1357 | +### INSERT INTO test2.t2 | ||
2617 | 1358 | +### SET | ||
2618 | 1359 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2619 | 1360 | +### INSERT INTO test2.t2 | ||
2620 | 1361 | +### SET | ||
2621 | 1362 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2622 | 1363 | +### INSERT INTO test2.t2 | ||
2623 | 1364 | +### SET | ||
2624 | 1365 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2625 | 1366 | +# at # | ||
2626 | 1367 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2627 | 1368 | +SET TIMESTAMP=1000000000/*!*/; | ||
2628 | 1369 | +COMMIT | ||
2629 | 1370 | +/*!*/; | ||
2630 | 1371 | +# at # | ||
2631 | 1372 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2632 | 1373 | +SET TIMESTAMP=1000000000/*!*/; | ||
2633 | 1374 | +BEGIN | ||
2634 | 1375 | +/*!*/; | ||
2635 | 1376 | +# at # | ||
2636 | 1377 | +# at # | ||
2637 | 1378 | +# at # | ||
2638 | 1379 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2639 | 1380 | +#Q> INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
2640 | 1381 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test3`.`t3` mapped to number # | ||
2641 | 1382 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2642 | 1383 | +### INSERT INTO test3.t3 | ||
2643 | 1384 | +### SET | ||
2644 | 1385 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2645 | 1386 | +### INSERT INTO test3.t3 | ||
2646 | 1387 | +### SET | ||
2647 | 1388 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2648 | 1389 | +### INSERT INTO test3.t3 | ||
2649 | 1390 | +### SET | ||
2650 | 1391 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2651 | 1392 | +# at # | ||
2652 | 1393 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2653 | 1394 | +SET TIMESTAMP=1000000000/*!*/; | ||
2654 | 1395 | +COMMIT | ||
2655 | 1396 | +/*!*/; | ||
2656 | 1397 | +# at # | ||
2657 | 1398 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2658 | 1399 | +SET TIMESTAMP=1000000000/*!*/; | ||
2659 | 1400 | +BEGIN | ||
2660 | 1401 | +/*!*/; | ||
2661 | 1402 | +# at # | ||
2662 | 1403 | +# at # | ||
2663 | 1404 | +# at # | ||
2664 | 1405 | +# at # | ||
2665 | 1406 | +# at # | ||
2666 | 1407 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2667 | 1408 | +#Q> DELETE test1.t1, test2.t2 | ||
2668 | 1409 | +#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
2669 | 1410 | +#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3 | ||
2670 | 1411 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2671 | 1412 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2672 | 1413 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # | ||
2673 | 1414 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F | ||
2674 | 1415 | +### DELETE FROM test1.t1 | ||
2675 | 1416 | +### WHERE | ||
2676 | 1417 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2677 | 1418 | +### DELETE FROM test1.t1 | ||
2678 | 1419 | +### WHERE | ||
2679 | 1420 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2680 | 1421 | +### DELETE FROM test1.t1 | ||
2681 | 1422 | +### WHERE | ||
2682 | 1423 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2683 | 1424 | +### DELETE FROM test2.t2 | ||
2684 | 1425 | +### WHERE | ||
2685 | 1426 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2686 | 1427 | +### DELETE FROM test2.t2 | ||
2687 | 1428 | +### WHERE | ||
2688 | 1429 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2689 | 1430 | +### DELETE FROM test2.t2 | ||
2690 | 1431 | +### WHERE | ||
2691 | 1432 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2692 | 1433 | +# at # | ||
2693 | 1434 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2694 | 1435 | +SET TIMESTAMP=1000000000/*!*/; | ||
2695 | 1436 | +COMMIT | ||
2696 | 1437 | +/*!*/; | ||
2697 | 1438 | +# at # | ||
2698 | 1439 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2699 | 1440 | +SET TIMESTAMP=1000000000/*!*/; | ||
2700 | 1441 | +BEGIN | ||
2701 | 1442 | +/*!*/; | ||
2702 | 1443 | +# at # | ||
2703 | 1444 | +# at # | ||
2704 | 1445 | +# at # | ||
2705 | 1446 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2706 | 1447 | +#Q> INSERT INTO test2.v2 VALUES (1), (2), (3) | ||
2707 | 1448 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2708 | 1449 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2709 | 1450 | +### INSERT INTO test2.t2 | ||
2710 | 1451 | +### SET | ||
2711 | 1452 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2712 | 1453 | +### INSERT INTO test2.t2 | ||
2713 | 1454 | +### SET | ||
2714 | 1455 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2715 | 1456 | +### INSERT INTO test2.t2 | ||
2716 | 1457 | +### SET | ||
2717 | 1458 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2718 | 1459 | +# at # | ||
2719 | 1460 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2720 | 1461 | +SET TIMESTAMP=1000000000/*!*/; | ||
2721 | 1462 | +COMMIT | ||
2722 | 1463 | +/*!*/; | ||
2723 | 1464 | +# at # | ||
2724 | 1465 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2725 | 1466 | +SET TIMESTAMP=1000000000/*!*/; | ||
2726 | 1467 | +BEGIN | ||
2727 | 1468 | +/*!*/; | ||
2728 | 1469 | +# at # | ||
2729 | 1470 | +# at # | ||
2730 | 1471 | +# at # | ||
2731 | 1472 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2732 | 1473 | +#Q> DELETE xtest1.xt1, test2.t2 | ||
2733 | 1474 | +#Q> FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
2734 | 1475 | +#Q> WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3 | ||
2735 | 1476 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2736 | 1477 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F | ||
2737 | 1478 | +### DELETE FROM test2.t2 | ||
2738 | 1479 | +### WHERE | ||
2739 | 1480 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2740 | 1481 | +### DELETE FROM test2.t2 | ||
2741 | 1482 | +### WHERE | ||
2742 | 1483 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2743 | 1484 | +### DELETE FROM test2.t2 | ||
2744 | 1485 | +### WHERE | ||
2745 | 1486 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2746 | 1487 | +# at # | ||
2747 | 1488 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2748 | 1489 | +SET TIMESTAMP=1000000000/*!*/; | ||
2749 | 1490 | +COMMIT | ||
2750 | 1491 | +/*!*/; | ||
2751 | 1492 | +# at # | ||
2752 | 1493 | +#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4 | ||
2753 | 1494 | +DELIMITER ; | ||
2754 | 1495 | +# End of log file | ||
2755 | 1496 | +ROLLBACK /* added by mysqlbinlog */; | ||
2756 | 1497 | +/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; | ||
2757 | 1498 | +# | ||
2758 | 1499 | +##################################################################################### | ||
2759 | 1500 | +# mysqlbinlog --read-from-remote-server --database=test1 | ||
2760 | 1501 | +# The following Annotate should appear in this output: | ||
2761 | 1502 | +# - DELETE test1.t1, test2.t2 FROM <...> | ||
2762 | 1503 | +##################################################################################### | ||
2763 | 1504 | +/*!40019 SET @@session.max_insert_delayed_threads=0*/; | ||
2764 | 1505 | +/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; | ||
2765 | 1506 | +DELIMITER /*!*/; | ||
2766 | 1507 | +# at # | ||
2767 | 1508 | +#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup | ||
2768 | 1509 | +ROLLBACK/*!*/; | ||
2769 | 1510 | +# at # | ||
2770 | 1511 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2771 | 1512 | +SET TIMESTAMP=1000000000/*!*/; | ||
2772 | 1513 | +SET @@session.pseudo_thread_id=#/*!*/; | ||
2773 | 1514 | +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; | ||
2774 | 1515 | +SET @@session.sql_mode=0/*!*/; | ||
2775 | 1516 | +SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; | ||
2776 | 1517 | +/*!\C latin1 *//*!*/; | ||
2777 | 1518 | +SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; | ||
2778 | 1519 | +SET @@session.lc_time_names=0/*!*/; | ||
2779 | 1520 | +SET @@session.collation_database=DEFAULT/*!*/; | ||
2780 | 1521 | +DROP DATABASE IF EXISTS test1 | ||
2781 | 1522 | +/*!*/; | ||
2782 | 1523 | +# at # | ||
2783 | 1524 | +# at # | ||
2784 | 1525 | +# at # | ||
2785 | 1526 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2786 | 1527 | +SET TIMESTAMP=1000000000/*!*/; | ||
2787 | 1528 | +CREATE DATABASE test1 | ||
2788 | 1529 | +/*!*/; | ||
2789 | 1530 | +# at # | ||
2790 | 1531 | +# at # | ||
2791 | 1532 | +# at # | ||
2792 | 1533 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2793 | 1534 | +SET TIMESTAMP=1000000000/*!*/; | ||
2794 | 1535 | +BEGIN | ||
2795 | 1536 | +/*!*/; | ||
2796 | 1537 | +# at # | ||
2797 | 1538 | +# at # | ||
2798 | 1539 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2799 | 1540 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2800 | 1541 | +### INSERT INTO test1.t1 | ||
2801 | 1542 | +### SET | ||
2802 | 1543 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2803 | 1544 | +### INSERT INTO test1.t1 | ||
2804 | 1545 | +### SET | ||
2805 | 1546 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2806 | 1547 | +### INSERT INTO test1.t1 | ||
2807 | 1548 | +### SET | ||
2808 | 1549 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2809 | 1550 | +# at # | ||
2810 | 1551 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2811 | 1552 | +SET TIMESTAMP=1000000000/*!*/; | ||
2812 | 1553 | +COMMIT | ||
2813 | 1554 | +/*!*/; | ||
2814 | 1555 | +# at # | ||
2815 | 1556 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2816 | 1557 | +SET TIMESTAMP=1000000000/*!*/; | ||
2817 | 1558 | +BEGIN | ||
2818 | 1559 | +/*!*/; | ||
2819 | 1560 | +# at # | ||
2820 | 1561 | +# at # | ||
2821 | 1562 | +# at # | ||
2822 | 1563 | +# at # | ||
2823 | 1564 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2824 | 1565 | +SET TIMESTAMP=1000000000/*!*/; | ||
2825 | 1566 | +COMMIT | ||
2826 | 1567 | +/*!*/; | ||
2827 | 1568 | +# at # | ||
2828 | 1569 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2829 | 1570 | +SET TIMESTAMP=1000000000/*!*/; | ||
2830 | 1571 | +BEGIN | ||
2831 | 1572 | +/*!*/; | ||
2832 | 1573 | +# at # | ||
2833 | 1574 | +# at # | ||
2834 | 1575 | +# at # | ||
2835 | 1576 | +# at # | ||
2836 | 1577 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2837 | 1578 | +SET TIMESTAMP=1000000000/*!*/; | ||
2838 | 1579 | +COMMIT | ||
2839 | 1580 | +/*!*/; | ||
2840 | 1581 | +# at # | ||
2841 | 1582 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2842 | 1583 | +SET TIMESTAMP=1000000000/*!*/; | ||
2843 | 1584 | +BEGIN | ||
2844 | 1585 | +/*!*/; | ||
2845 | 1586 | +# at # | ||
2846 | 1587 | +# at # | ||
2847 | 1588 | +# at # | ||
2848 | 1589 | +# at # | ||
2849 | 1590 | +# at # | ||
2850 | 1591 | +#010909 4:46:40 server id # end_log_pos # Annotate_rows: | ||
2851 | 1592 | +#Q> DELETE test1.t1, test2.t2 | ||
2852 | 1593 | +#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
2853 | 1594 | +#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3 | ||
2854 | 1595 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2855 | 1596 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # | ||
2856 | 1597 | +### DELETE FROM test1.t1 | ||
2857 | 1598 | +### WHERE | ||
2858 | 1599 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2859 | 1600 | +### DELETE FROM test1.t1 | ||
2860 | 1601 | +### WHERE | ||
2861 | 1602 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2862 | 1603 | +### DELETE FROM test1.t1 | ||
2863 | 1604 | +### WHERE | ||
2864 | 1605 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2865 | 1606 | +# at # | ||
2866 | 1607 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2867 | 1608 | +SET TIMESTAMP=1000000000/*!*/; | ||
2868 | 1609 | +COMMIT | ||
2869 | 1610 | +/*!*/; | ||
2870 | 1611 | +# at # | ||
2871 | 1612 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2872 | 1613 | +SET TIMESTAMP=1000000000/*!*/; | ||
2873 | 1614 | +BEGIN | ||
2874 | 1615 | +/*!*/; | ||
2875 | 1616 | +# at # | ||
2876 | 1617 | +# at # | ||
2877 | 1618 | +# at # | ||
2878 | 1619 | +# at # | ||
2879 | 1620 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2880 | 1621 | +SET TIMESTAMP=1000000000/*!*/; | ||
2881 | 1622 | +COMMIT | ||
2882 | 1623 | +/*!*/; | ||
2883 | 1624 | +# at # | ||
2884 | 1625 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2885 | 1626 | +SET TIMESTAMP=1000000000/*!*/; | ||
2886 | 1627 | +BEGIN | ||
2887 | 1628 | +/*!*/; | ||
2888 | 1629 | +# at # | ||
2889 | 1630 | +# at # | ||
2890 | 1631 | +# at # | ||
2891 | 1632 | +# at # | ||
2892 | 1633 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2893 | 1634 | +SET TIMESTAMP=1000000000/*!*/; | ||
2894 | 1635 | +COMMIT | ||
2895 | 1636 | +/*!*/; | ||
2896 | 1637 | +# at # | ||
2897 | 1638 | +#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4 | ||
2898 | 1639 | +DELIMITER ; | ||
2899 | 1640 | +# End of log file | ||
2900 | 1641 | +ROLLBACK /* added by mysqlbinlog */; | ||
2901 | 1642 | +/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; | ||
2902 | 1643 | +# | ||
2903 | 1644 | +##################################################################################### | ||
2904 | 1645 | +# mysqlbinlog --read-from-remote-server --skip-annotate-rows-events | ||
2905 | 1646 | +# No Annotates should appear in this output | ||
2906 | 1647 | +##################################################################################### | ||
2907 | 1648 | +/*!40019 SET @@session.max_insert_delayed_threads=0*/; | ||
2908 | 1649 | +/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; | ||
2909 | 1650 | +DELIMITER /*!*/; | ||
2910 | 1651 | +# at # | ||
2911 | 1652 | +#010909 4:46:40 server id # end_log_pos # Start: binlog v 4, server v #.##.## created 010909 4:46:40 at startup | ||
2912 | 1653 | +ROLLBACK/*!*/; | ||
2913 | 1654 | +# at # | ||
2914 | 1655 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2915 | 1656 | +SET TIMESTAMP=1000000000/*!*/; | ||
2916 | 1657 | +SET @@session.pseudo_thread_id=#/*!*/; | ||
2917 | 1658 | +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; | ||
2918 | 1659 | +SET @@session.sql_mode=0/*!*/; | ||
2919 | 1660 | +SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; | ||
2920 | 1661 | +/*!\C latin1 *//*!*/; | ||
2921 | 1662 | +SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; | ||
2922 | 1663 | +SET @@session.lc_time_names=0/*!*/; | ||
2923 | 1664 | +SET @@session.collation_database=DEFAULT/*!*/; | ||
2924 | 1665 | +DROP DATABASE IF EXISTS test1 | ||
2925 | 1666 | +/*!*/; | ||
2926 | 1667 | +# at # | ||
2927 | 1668 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2928 | 1669 | +SET TIMESTAMP=1000000000/*!*/; | ||
2929 | 1670 | +DROP DATABASE IF EXISTS test2 | ||
2930 | 1671 | +/*!*/; | ||
2931 | 1672 | +# at # | ||
2932 | 1673 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2933 | 1674 | +SET TIMESTAMP=1000000000/*!*/; | ||
2934 | 1675 | +DROP DATABASE IF EXISTS test3 | ||
2935 | 1676 | +/*!*/; | ||
2936 | 1677 | +# at # | ||
2937 | 1678 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2938 | 1679 | +SET TIMESTAMP=1000000000/*!*/; | ||
2939 | 1680 | +CREATE DATABASE test1 | ||
2940 | 1681 | +/*!*/; | ||
2941 | 1682 | +# at # | ||
2942 | 1683 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2943 | 1684 | +SET TIMESTAMP=1000000000/*!*/; | ||
2944 | 1685 | +CREATE DATABASE test2 | ||
2945 | 1686 | +/*!*/; | ||
2946 | 1687 | +# at # | ||
2947 | 1688 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2948 | 1689 | +SET TIMESTAMP=1000000000/*!*/; | ||
2949 | 1690 | +CREATE DATABASE test3 | ||
2950 | 1691 | +/*!*/; | ||
2951 | 1692 | +# at # | ||
2952 | 1693 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2953 | 1694 | +SET TIMESTAMP=1000000000/*!*/; | ||
2954 | 1695 | +BEGIN | ||
2955 | 1696 | +/*!*/; | ||
2956 | 1697 | +# at # | ||
2957 | 1698 | +# at # | ||
2958 | 1699 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
2959 | 1700 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2960 | 1701 | +### INSERT INTO test1.t1 | ||
2961 | 1702 | +### SET | ||
2962 | 1703 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2963 | 1704 | +### INSERT INTO test1.t1 | ||
2964 | 1705 | +### SET | ||
2965 | 1706 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2966 | 1707 | +### INSERT INTO test1.t1 | ||
2967 | 1708 | +### SET | ||
2968 | 1709 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2969 | 1710 | +# at # | ||
2970 | 1711 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2971 | 1712 | +SET TIMESTAMP=1000000000/*!*/; | ||
2972 | 1713 | +COMMIT | ||
2973 | 1714 | +/*!*/; | ||
2974 | 1715 | +# at # | ||
2975 | 1716 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2976 | 1717 | +SET TIMESTAMP=1000000000/*!*/; | ||
2977 | 1718 | +BEGIN | ||
2978 | 1719 | +/*!*/; | ||
2979 | 1720 | +# at # | ||
2980 | 1721 | +# at # | ||
2981 | 1722 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
2982 | 1723 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
2983 | 1724 | +### INSERT INTO test2.t2 | ||
2984 | 1725 | +### SET | ||
2985 | 1726 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
2986 | 1727 | +### INSERT INTO test2.t2 | ||
2987 | 1728 | +### SET | ||
2988 | 1729 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
2989 | 1730 | +### INSERT INTO test2.t2 | ||
2990 | 1731 | +### SET | ||
2991 | 1732 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
2992 | 1733 | +# at # | ||
2993 | 1734 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2994 | 1735 | +SET TIMESTAMP=1000000000/*!*/; | ||
2995 | 1736 | +COMMIT | ||
2996 | 1737 | +/*!*/; | ||
2997 | 1738 | +# at # | ||
2998 | 1739 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
2999 | 1740 | +SET TIMESTAMP=1000000000/*!*/; | ||
3000 | 1741 | +BEGIN | ||
3001 | 1742 | +/*!*/; | ||
3002 | 1743 | +# at # | ||
3003 | 1744 | +# at # | ||
3004 | 1745 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test3`.`t3` mapped to number # | ||
3005 | 1746 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
3006 | 1747 | +### INSERT INTO test3.t3 | ||
3007 | 1748 | +### SET | ||
3008 | 1749 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
3009 | 1750 | +### INSERT INTO test3.t3 | ||
3010 | 1751 | +### SET | ||
3011 | 1752 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
3012 | 1753 | +### INSERT INTO test3.t3 | ||
3013 | 1754 | +### SET | ||
3014 | 1755 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
3015 | 1756 | +# at # | ||
3016 | 1757 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
3017 | 1758 | +SET TIMESTAMP=1000000000/*!*/; | ||
3018 | 1759 | +COMMIT | ||
3019 | 1760 | +/*!*/; | ||
3020 | 1761 | +# at # | ||
3021 | 1762 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
3022 | 1763 | +SET TIMESTAMP=1000000000/*!*/; | ||
3023 | 1764 | +BEGIN | ||
3024 | 1765 | +/*!*/; | ||
3025 | 1766 | +# at # | ||
3026 | 1767 | +# at # | ||
3027 | 1768 | +# at # | ||
3028 | 1769 | +# at # | ||
3029 | 1770 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test1`.`t1` mapped to number # | ||
3030 | 1771 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
3031 | 1772 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # | ||
3032 | 1773 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F | ||
3033 | 1774 | +### DELETE FROM test1.t1 | ||
3034 | 1775 | +### WHERE | ||
3035 | 1776 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
3036 | 1777 | +### DELETE FROM test1.t1 | ||
3037 | 1778 | +### WHERE | ||
3038 | 1779 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
3039 | 1780 | +### DELETE FROM test1.t1 | ||
3040 | 1781 | +### WHERE | ||
3041 | 1782 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
3042 | 1783 | +### DELETE FROM test2.t2 | ||
3043 | 1784 | +### WHERE | ||
3044 | 1785 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
3045 | 1786 | +### DELETE FROM test2.t2 | ||
3046 | 1787 | +### WHERE | ||
3047 | 1788 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
3048 | 1789 | +### DELETE FROM test2.t2 | ||
3049 | 1790 | +### WHERE | ||
3050 | 1791 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
3051 | 1792 | +# at # | ||
3052 | 1793 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
3053 | 1794 | +SET TIMESTAMP=1000000000/*!*/; | ||
3054 | 1795 | +COMMIT | ||
3055 | 1796 | +/*!*/; | ||
3056 | 1797 | +# at # | ||
3057 | 1798 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
3058 | 1799 | +SET TIMESTAMP=1000000000/*!*/; | ||
3059 | 1800 | +BEGIN | ||
3060 | 1801 | +/*!*/; | ||
3061 | 1802 | +# at # | ||
3062 | 1803 | +# at # | ||
3063 | 1804 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
3064 | 1805 | +#010909 4:46:40 server id # end_log_pos # Write_rows: table id # flags: STMT_END_F | ||
3065 | 1806 | +### INSERT INTO test2.t2 | ||
3066 | 1807 | +### SET | ||
3067 | 1808 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
3068 | 1809 | +### INSERT INTO test2.t2 | ||
3069 | 1810 | +### SET | ||
3070 | 1811 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
3071 | 1812 | +### INSERT INTO test2.t2 | ||
3072 | 1813 | +### SET | ||
3073 | 1814 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
3074 | 1815 | +# at # | ||
3075 | 1816 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
3076 | 1817 | +SET TIMESTAMP=1000000000/*!*/; | ||
3077 | 1818 | +COMMIT | ||
3078 | 1819 | +/*!*/; | ||
3079 | 1820 | +# at # | ||
3080 | 1821 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
3081 | 1822 | +SET TIMESTAMP=1000000000/*!*/; | ||
3082 | 1823 | +BEGIN | ||
3083 | 1824 | +/*!*/; | ||
3084 | 1825 | +# at # | ||
3085 | 1826 | +# at # | ||
3086 | 1827 | +#010909 4:46:40 server id # end_log_pos # Table_map: `test2`.`t2` mapped to number # | ||
3087 | 1828 | +#010909 4:46:40 server id # end_log_pos # Delete_rows: table id # flags: STMT_END_F | ||
3088 | 1829 | +### DELETE FROM test2.t2 | ||
3089 | 1830 | +### WHERE | ||
3090 | 1831 | +### @1=3 /* INT meta=0 nullable=1 is_null=0 */ | ||
3091 | 1832 | +### DELETE FROM test2.t2 | ||
3092 | 1833 | +### WHERE | ||
3093 | 1834 | +### @1=2 /* INT meta=0 nullable=1 is_null=0 */ | ||
3094 | 1835 | +### DELETE FROM test2.t2 | ||
3095 | 1836 | +### WHERE | ||
3096 | 1837 | +### @1=1 /* INT meta=0 nullable=1 is_null=0 */ | ||
3097 | 1838 | +# at # | ||
3098 | 1839 | +#010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 | ||
3099 | 1840 | +SET TIMESTAMP=1000000000/*!*/; | ||
3100 | 1841 | +COMMIT | ||
3101 | 1842 | +/*!*/; | ||
3102 | 1843 | +# at # | ||
3103 | 1844 | +#010909 4:46:40 server id # end_log_pos # Rotate to master-bin.000002 pos: 4 | ||
3104 | 1845 | +DELIMITER ; | ||
3105 | 1846 | +# End of log file | ||
3106 | 1847 | +ROLLBACK /* added by mysqlbinlog */; | ||
3107 | 1848 | +/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; | ||
3108 | 1849 | --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result | ||
3109 | 1850 | +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result | ||
3110 | 1851 | @@ -331,7 +331,7 @@ | ||
3111 | 1852 | master-bin.000001 # Query # # use `test`; insert into t1 values( 243 ) | ||
3112 | 1853 | master-bin.000001 # Query # # use `test`; insert into t1 values( 242 ) | ||
3113 | 1854 | master-bin.000001 # Query # # use `test`; insert into t1 values( 241 ) | ||
3114 | 1855 | -master-bin.000001 # Query # # use `test`; insert into t1 values( 240 ) | ||
3115 | 1856 | +master-bin.000001 # Query # # use `test`; insert into t1 values( <binlog_start> ) | ||
3116 | 1857 | master-bin.000001 # Query # # use `test`; insert into t1 values( 239 ) | ||
3117 | 1858 | master-bin.000001 # Query # # use `test`; insert into t1 values( 238 ) | ||
3118 | 1859 | master-bin.000001 # Query # # use `test`; insert into t1 values( 237 ) | ||
3119 | 1860 | @@ -465,7 +465,7 @@ | ||
3120 | 1861 | master-bin.000001 # Query # # use `test`; insert into t1 values( 109 ) | ||
3121 | 1862 | master-bin.000001 # Query # # use `test`; insert into t1 values( 108 ) | ||
3122 | 1863 | master-bin.000001 # Query # # use `test`; insert into t1 values( 107 ) | ||
3123 | 1864 | -master-bin.000001 # Query # # use `test`; insert into t1 values( <binlog_start> ) | ||
3124 | 1865 | +master-bin.000001 # Query # # use `test`; insert into t1 values( 106 ) | ||
3125 | 1866 | master-bin.000001 # Query # # use `test`; insert into t1 values( 105 ) | ||
3126 | 1867 | master-bin.000001 # Query # # use `test`; insert into t1 values( 104 ) | ||
3127 | 1868 | master-bin.000001 # Query # # use `test`; insert into t1 values( 103 ) | ||
3128 | 1869 | --- a/mysql-test/suite/binlog/t/binlog_incident.test | ||
3129 | 1870 | +++ b/mysql-test/suite/binlog/t/binlog_incident.test | ||
3130 | 1871 | @@ -4,6 +4,7 @@ | ||
3131 | 1872 | |||
3132 | 1873 | source include/have_log_bin.inc; | ||
3133 | 1874 | source include/have_debug.inc; | ||
3134 | 1875 | +source include/binlog_start_pos.inc; | ||
3135 | 1876 | |||
3136 | 1877 | let $MYSQLD_DATADIR= `select @@datadir`; | ||
3137 | 1878 | RESET MASTER; | ||
3138 | 1879 | @@ -20,7 +21,7 @@ | ||
3139 | 1880 | DROP TABLE t1; | ||
3140 | 1881 | FLUSH LOGS; | ||
3141 | 1882 | |||
3142 | 1883 | -exec $MYSQL_BINLOG --start-position=106 $MYSQLD_DATADIR/master-bin.000001 >$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql; | ||
3143 | 1884 | +exec $MYSQL_BINLOG --start-position=$binlog_start_pos $MYSQLD_DATADIR/master-bin.000001 >$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql; | ||
3144 | 1885 | --disable_query_log | ||
3145 | 1886 | 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; | ||
3146 | 1887 | --enable_query_log | ||
3147 | 1888 | --- a/mysql-test/suite/binlog/t/binlog_killed.test | ||
3148 | 1889 | +++ b/mysql-test/suite/binlog/t/binlog_killed.test | ||
3149 | 1890 | @@ -1,5 +1,6 @@ | ||
3150 | 1891 | -- source include/have_innodb.inc | ||
3151 | 1892 | -- source include/have_binlog_format_statement.inc | ||
3152 | 1893 | +-- source include/binlog_start_pos.inc | ||
3153 | 1894 | |||
3154 | 1895 | # You cannot use `KILL' with the Embedded MySQL Server library, | ||
3155 | 1896 | # because the embedded server merely runs inside the threads of the host | ||
3156 | 1897 | @@ -51,7 +52,8 @@ | ||
3157 | 1898 | let $rows= `select count(*) from t2 /* must be 2 or 0 */`; | ||
3158 | 1899 | |||
3159 | 1900 | let $MYSQLD_DATADIR= `select @@datadir`; | ||
3160 | 1901 | ---exec $MYSQL_BINLOG --force-if-open --start-position=134 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog | ||
3161 | 1902 | +let $start_pos= `select @binlog_start_pos + 28`; | ||
3162 | 1903 | +--exec $MYSQL_BINLOG --force-if-open --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog | ||
3163 | 1904 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3164 | 1905 | eval select | ||
3165 | 1906 | (@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog")) | ||
3166 | 1907 | --- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test | ||
3167 | 1908 | +++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test | ||
3168 | 1909 | @@ -1,5 +1,6 @@ | ||
3169 | 1910 | -- source include/have_debug.inc | ||
3170 | 1911 | -- source include/have_binlog_format_statement.inc | ||
3171 | 1912 | +-- source include/binlog_start_pos.inc | ||
3172 | 1913 | # | ||
3173 | 1914 | # bug#27571 asynchronous setting mysql_$query()'s local error and | ||
3174 | 1915 | # Query_log_event::error_code | ||
3175 | 1916 | @@ -24,7 +25,7 @@ | ||
3176 | 1917 | # for some constants like the offset of the first real event | ||
3177 | 1918 | # that is different between severs versions. | ||
3178 | 1919 | let $MYSQLD_DATADIR= `select @@datadir`; | ||
3179 | 1920 | ---exec $MYSQL_BINLOG --force-if-open --start-position=106 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog | ||
3180 | 1921 | +--exec $MYSQL_BINLOG --force-if-open --start-position=$binlog_start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog | ||
3181 | 1922 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3182 | 1923 | eval select | ||
3183 | 1924 | (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog")) | ||
3184 | 1925 | --- /dev/null | ||
3185 | 1926 | +++ b/mysql-test/suite/binlog/t/binlog_row_annotate-master.opt | ||
3186 | 1927 | @@ -0,0 +1 @@ | ||
3187 | 1928 | +--timezone=GMT-3 --binlog-do-db=test1 --binlog-do-db=test2 --binlog-do-db=test3 | ||
3188 | 1929 | --- /dev/null | ||
3189 | 1930 | +++ b/mysql-test/suite/binlog/t/binlog_row_annotate.test | ||
3190 | 1931 | @@ -0,0 +1,189 @@ | ||
3191 | 1932 | +############################################################################### | ||
3192 | 1933 | +# WL47: Store in binlog text of statements that caused RBR events | ||
3193 | 1934 | +# new event: ANNOTATE_ROWS_EVENT | ||
3194 | 1935 | +# new master option: --binlog-annotate-rows-events | ||
3195 | 1936 | +# new mysqlbinlog option: --skip-annotate-rows-events | ||
3196 | 1937 | +# | ||
3197 | 1938 | +# Intended to test that: | ||
3198 | 1939 | +# *** If the --binlog-annotate-rows-events option is switched on on master | ||
3199 | 1940 | +# then Annotate_rows events: | ||
3200 | 1941 | +# - are generated; | ||
3201 | 1942 | +# - are generated only once for "multi-table-maps" rbr queries; | ||
3202 | 1943 | +# - are not generated when the corresponding queries are filtered away; | ||
3203 | 1944 | +# - are generated when the corresponding queries are filtered away partialy | ||
3204 | 1945 | +# (e.g. in case of multi-delete). | ||
3205 | 1946 | +# *** Annotate_rows events are printed by mysqlbinlog started without | ||
3206 | 1947 | +# --skip-annotate-rows-events options both in remote and local cases. | ||
3207 | 1948 | +# *** Annotate_rows events are not printed by mysqlbinlog started with | ||
3208 | 1949 | +# --skip-annotate-rows-events options both in remote and local cases. | ||
3209 | 1950 | +############################################################################### | ||
3210 | 1951 | + | ||
3211 | 1952 | +--source include/have_log_bin.inc | ||
3212 | 1953 | +--source include/have_binlog_format_row.inc | ||
3213 | 1954 | +--source include/binlog_start_pos.inc | ||
3214 | 1955 | + | ||
3215 | 1956 | +--disable_query_log | ||
3216 | 1957 | + | ||
3217 | 1958 | +# Fix timestamp to avoid varying results | ||
3218 | 1959 | +SET timestamp=1000000000; | ||
3219 | 1960 | + | ||
3220 | 1961 | +# Delete all existing binary logs | ||
3221 | 1962 | +RESET MASTER; | ||
3222 | 1963 | + | ||
3223 | 1964 | +--disable_warnings | ||
3224 | 1965 | +DROP DATABASE IF EXISTS test1; | ||
3225 | 1966 | +DROP DATABASE IF EXISTS test2; | ||
3226 | 1967 | +DROP DATABASE IF EXISTS test3; | ||
3227 | 1968 | +DROP DATABASE IF EXISTS xtest1; | ||
3228 | 1969 | +DROP DATABASE IF EXISTS xtest2; | ||
3229 | 1970 | +--enable_warnings | ||
3230 | 1971 | + | ||
3231 | 1972 | +CREATE DATABASE test1; | ||
3232 | 1973 | +CREATE TABLE test1.t1(a int); | ||
3233 | 1974 | + | ||
3234 | 1975 | +CREATE DATABASE test2; | ||
3235 | 1976 | +CREATE TABLE test2.t2(a int); | ||
3236 | 1977 | +CREATE VIEW test2.v2 AS SELECT * FROM test2.t2; | ||
3237 | 1978 | + | ||
3238 | 1979 | +CREATE DATABASE test3; | ||
3239 | 1980 | +CREATE TABLE test3.t3(a int); | ||
3240 | 1981 | + | ||
3241 | 1982 | +CREATE DATABASE xtest1; | ||
3242 | 1983 | +CREATE TABLE xtest1.xt1(a int); | ||
3243 | 1984 | + | ||
3244 | 1985 | +CREATE DATABASE xtest2; | ||
3245 | 1986 | +CREATE TABLE xtest2.xt2(a int); | ||
3246 | 1987 | + | ||
3247 | 1988 | +# By default SESSION binlog_annotate_rows_events = OFF | ||
3248 | 1989 | + | ||
3249 | 1990 | +INSERT INTO test1.t1 VALUES (1), (2), (3); | ||
3250 | 1991 | + | ||
3251 | 1992 | +SET SESSION binlog_annotate_rows_events = ON; | ||
3252 | 1993 | + | ||
3253 | 1994 | +INSERT INTO test2.t2 VALUES (1), (2), (3); | ||
3254 | 1995 | +INSERT INTO test3.t3 VALUES (1), (2), (3); | ||
3255 | 1996 | + | ||
3256 | 1997 | +# This query generates two Table maps but the Annotate | ||
3257 | 1998 | +# event should appear only once before the first Table map | ||
3258 | 1999 | +DELETE test1.t1, test2.t2 | ||
3259 | 2000 | + FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
3260 | 2001 | + WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3.a; | ||
3261 | 2002 | + | ||
3262 | 2003 | +# This event should be filtered out together with Annotate event | ||
3263 | 2004 | +INSERT INTO xtest1.xt1 VALUES (1), (2), (3); | ||
3264 | 2005 | + | ||
3265 | 2006 | +# This event should pass the filter | ||
3266 | 2007 | +INSERT INTO test2.v2 VALUES (1), (2), (3); | ||
3267 | 2008 | + | ||
3268 | 2009 | +# This event should pass the filter only for test2.t2 part | ||
3269 | 2010 | +DELETE xtest1.xt1, test2.t2 | ||
3270 | 2011 | + FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3 | ||
3271 | 2012 | + WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3.a; | ||
3272 | 2013 | + | ||
3273 | 2014 | +# These events should be filtered out together with Annotate events | ||
3274 | 2015 | +INSERT INTO xtest1.xt1 VALUES (1), (2), (3); | ||
3275 | 2016 | +INSERT INTO xtest2.xt2 VALUES (1), (2), (3); | ||
3276 | 2017 | +DELETE xtest1.xt1, xtest2.xt2 | ||
3277 | 2018 | + FROM xtest1.xt1 INNER JOIN xtest2.xt2 INNER JOIN test3.t3 | ||
3278 | 2019 | + WHERE xtest1.xt1.a=xtest2.xt2.a AND xtest2.xt2.a=test3.t3.a; | ||
3279 | 2020 | + | ||
3280 | 2021 | +FLUSH LOGS; | ||
3281 | 2022 | +--enable_query_log | ||
3282 | 2023 | + | ||
3283 | 2024 | +--echo ##################################################################################### | ||
3284 | 2025 | +--echo # The following Annotate_rows events should appear below: | ||
3285 | 2026 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
3286 | 2027 | +--echo # - INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
3287 | 2028 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> | ||
3288 | 2029 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
3289 | 2030 | +--echo # - DELETE xtest1.xt1, test2.t2 FROM <...> | ||
3290 | 2031 | +--echo ##################################################################################### | ||
3291 | 2032 | + | ||
3292 | 2033 | +let $start_pos= `select @binlog_start_pos`; | ||
3293 | 2034 | +--replace_column 2 # 5 # | ||
3294 | 2035 | +--replace_result $start_pos <start_pos> | ||
3295 | 2036 | +--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// | ||
3296 | 2037 | +--eval show binlog events in 'master-bin.000001' from $start_pos | ||
3297 | 2038 | + | ||
3298 | 2039 | +--echo # | ||
3299 | 2040 | +--echo ##################################################################################### | ||
3300 | 2041 | +--echo # mysqlbinlog | ||
3301 | 2042 | +--echo # The following Annotates should appear in this output: | ||
3302 | 2043 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
3303 | 2044 | +--echo # - INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
3304 | 2045 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> (with two subsequent Table maps) | ||
3305 | 2046 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
3306 | 2047 | +--echo # - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map) | ||
3307 | 2048 | +--echo ##################################################################################### | ||
3308 | 2049 | + | ||
3309 | 2050 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
3310 | 2051 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
3311 | 2052 | +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v $MYSQLD_DATADIR/master-bin.000001 | ||
3312 | 2053 | + | ||
3313 | 2054 | +--echo # | ||
3314 | 2055 | +--echo ##################################################################################### | ||
3315 | 2056 | +--echo # mysqlbinlog --database=test1 | ||
3316 | 2057 | +--echo # The following Annotate should appear in this output: | ||
3317 | 2058 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> | ||
3318 | 2059 | +--echo ##################################################################################### | ||
3319 | 2060 | + | ||
3320 | 2061 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
3321 | 2062 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
3322 | 2063 | +--exec $MYSQL_BINLOG --base64-output=decode-rows --database=test1 -v -v $MYSQLD_DATADIR/master-bin.000001 | ||
3323 | 2064 | + | ||
3324 | 2065 | +--echo # | ||
3325 | 2066 | +--echo ##################################################################################### | ||
3326 | 2067 | +--echo # mysqlbinlog --skip-annotate-rows-events | ||
3327 | 2068 | +--echo # No Annotates should appear in this output | ||
3328 | 2069 | +--echo ##################################################################################### | ||
3329 | 2070 | + | ||
3330 | 2071 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
3331 | 2072 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
3332 | 2073 | +--exec $MYSQL_BINLOG --base64-output=decode-rows --skip-annotate-rows-events -v -v $MYSQLD_DATADIR/master-bin.000001 | ||
3333 | 2074 | + | ||
3334 | 2075 | +--echo # | ||
3335 | 2076 | +--echo ##################################################################################### | ||
3336 | 2077 | +--echo # mysqlbinlog --read-from-remote-server | ||
3337 | 2078 | +--echo # The following Annotates should appear in this output: | ||
3338 | 2079 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
3339 | 2080 | +--echo # - INSERT INTO test3.t3 VALUES (1), (2), (3) | ||
3340 | 2081 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> (with two subsequent Table maps) | ||
3341 | 2082 | +--echo # - INSERT INTO test2.t2 VALUES (1), (2), (3) | ||
3342 | 2083 | +--echo # - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map) | ||
3343 | 2084 | +--echo ##################################################################################### | ||
3344 | 2085 | + | ||
3345 | 2086 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
3346 | 2087 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
3347 | 2088 | +--exec $MYSQL_BINLOG --base64-output=decode-rows -v -v --read-from-remote-server --user=root --host=localhost --port=$MASTER_MYPORT master-bin.000001 | ||
3348 | 2089 | + | ||
3349 | 2090 | +--echo # | ||
3350 | 2091 | +--echo ##################################################################################### | ||
3351 | 2092 | +--echo # mysqlbinlog --read-from-remote-server --database=test1 | ||
3352 | 2093 | +--echo # The following Annotate should appear in this output: | ||
3353 | 2094 | +--echo # - DELETE test1.t1, test2.t2 FROM <...> | ||
3354 | 2095 | +--echo ##################################################################################### | ||
3355 | 2096 | + | ||
3356 | 2097 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
3357 | 2098 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
3358 | 2099 | +--exec $MYSQL_BINLOG --base64-output=decode-rows --database=test1 -v -v --read-from-remote-server --user=root --host=localhost --port=$MASTER_MYPORT master-bin.000001 | ||
3359 | 2100 | + | ||
3360 | 2101 | +--echo # | ||
3361 | 2102 | +--echo ##################################################################################### | ||
3362 | 2103 | +--echo # mysqlbinlog --read-from-remote-server --skip-annotate-rows-events | ||
3363 | 2104 | +--echo # No Annotates should appear in this output | ||
3364 | 2105 | +--echo ##################################################################################### | ||
3365 | 2106 | + | ||
3366 | 2107 | +let $MYSQLD_DATADIR= `select @@datadir`; | ||
3367 | 2108 | +--replace_regex /server id [0-9]*/server id #/ /server v [^ ]*/server v #.##.##/ /exec_time=[0-9]*/exec_time=#/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ | ||
3368 | 2109 | +--exec $MYSQL_BINLOG --base64-output=decode-rows --skip-annotate-rows-events -v -v --read-from-remote-server --user=root --host=localhost --port=$MASTER_MYPORT master-bin.000001 | ||
3369 | 2110 | + | ||
3370 | 2111 | +# Clean-up | ||
3371 | 2112 | + | ||
3372 | 2113 | +--disable_query_log | ||
3373 | 2114 | +DROP DATABASE test1; | ||
3374 | 2115 | +DROP DATABASE test2; | ||
3375 | 2116 | +DROP DATABASE test3; | ||
3376 | 2117 | +DROP DATABASE xtest1; | ||
3377 | 2118 | +DROP DATABASE xtest2; | ||
3378 | 2119 | +--enable_query_log | ||
3379 | 2120 | + | ||
3380 | 2121 | --- /dev/null | ||
3381 | 2122 | +++ b/mysql-test/suite/rpl/r/percona_replicate_annotate_rows_events.result | ||
3382 | 2123 | @@ -0,0 +1,16 @@ | ||
3383 | 2124 | +include/master-slave.inc | ||
3384 | 2125 | +[connection master] | ||
3385 | 2126 | +DROP TABLE IF EXISTS t; | ||
3386 | 2127 | +CREATE TABLE t (a INT); | ||
3387 | 2128 | +INSERT INTO t VALUES(1); | ||
3388 | 2129 | +DROP TABLE t; | ||
3389 | 2130 | +select 738; | ||
3390 | 2131 | +738 | ||
3391 | 2132 | +738 | ||
3392 | 2133 | +select 738 = 738; | ||
3393 | 2134 | +738 = 738 | ||
3394 | 2135 | +1 | ||
3395 | 2136 | +select 738 = 738; | ||
3396 | 2137 | +738 = 738 | ||
3397 | 2138 | +1 | ||
3398 | 2139 | +include/rpl_end.inc | ||
3399 | 2140 | --- /dev/null | ||
3400 | 2141 | +++ b/mysql-test/suite/rpl/r/rpl_row_annotate_do.result | ||
3401 | 2142 | @@ -0,0 +1,141 @@ | ||
3402 | 2143 | +include/master-slave.inc | ||
3403 | 2144 | +[connection master] | ||
3404 | 2145 | +######################################################################## | ||
3405 | 2146 | +# TABLES ON MASTER | ||
3406 | 2147 | +######################################################################## | ||
3407 | 2148 | +SELECT * FROM t1 ORDER BY a; | ||
3408 | 2149 | +a b | ||
3409 | 2150 | +0 1 | ||
3410 | 2151 | +SELECT * FROM t2 ORDER BY a; | ||
3411 | 2152 | +a b | ||
3412 | 2153 | +SELECT * FROM t3 ORDER BY a; | ||
3413 | 2154 | +a b | ||
3414 | 2155 | +1 1 | ||
3415 | 2156 | +2 2 | ||
3416 | 2157 | +3 3 | ||
3417 | 2158 | +SELECT * FROM t5 ORDER BY a; | ||
3418 | 2159 | +a b | ||
3419 | 2160 | +1 foo | ||
3420 | 2161 | +2 bar | ||
3421 | 2162 | +3 baz | ||
3422 | 2163 | +4 gås | ||
3423 | 2164 | +5 gås | ||
3424 | 2165 | +######################################################################## | ||
3425 | 2166 | +# TABLES ON SLAVE: should be the same as on master | ||
3426 | 2167 | +######################################################################## | ||
3427 | 2168 | +SELECT * FROM t1 ORDER BY a; | ||
3428 | 2169 | +a b | ||
3429 | 2170 | +0 1 | ||
3430 | 2171 | +SELECT * FROM t2 ORDER BY a; | ||
3431 | 2172 | +a b | ||
3432 | 2173 | +SELECT * FROM t3 ORDER BY a; | ||
3433 | 2174 | +a b | ||
3434 | 2175 | +1 1 | ||
3435 | 2176 | +2 2 | ||
3436 | 2177 | +3 3 | ||
3437 | 2178 | +SELECT * FROM t5 ORDER BY a; | ||
3438 | 2179 | +a b | ||
3439 | 2180 | +1 foo | ||
3440 | 2181 | +2 bar | ||
3441 | 2182 | +3 baz | ||
3442 | 2183 | +4 gås | ||
3443 | 2184 | +5 gås | ||
3444 | 2185 | +######################################################################## | ||
3445 | 2186 | +# EVENTS ON SLAVE | ||
3446 | 2187 | +# The following Annotate_rows events should appear below: | ||
3447 | 2188 | +# - UPDATE t1 SET b = b + 1; | ||
3448 | 2189 | +# - REPLACE t1 VALUES (1,1), (2,2), (3,3); | ||
3449 | 2190 | +# - INSERT INTO t2 VALUES (1,1), (2,2), (3,3) | ||
3450 | 2191 | +# - INSERT INTO t3 VALUES (1,1), (2,2), (3,3) | ||
3451 | 2192 | +# - DELETE t1, t2 FROM <...> | ||
3452 | 2193 | +# - INSERT INTO t2 VALUES (1,1), (2,2), (3,3) | ||
3453 | 2194 | +# - DELETE xt1, t2 FROM <...> | ||
3454 | 2195 | +# - INSERT INTO t5(b) VALUES <...> (3 instances) | ||
3455 | 2196 | +######################################################################## | ||
3456 | 2197 | +FLUSH LOGS; | ||
3457 | 2198 | +show binlog events in 'slave-bin.000001' from <start_pos>; | ||
3458 | 2199 | +Log_name Pos Event_type Server_id End_log_pos Info | ||
3459 | 2200 | +slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test1 | ||
3460 | 2201 | +slave-bin.000001 # Query 1 # CREATE DATABASE test1 | ||
3461 | 2202 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t1(a int primary key, b int) | ||
3462 | 2203 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t2(a int, b int) | ||
3463 | 2204 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t3(a int, b int) | ||
3464 | 2205 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t4(a int, b int) | ||
3465 | 2206 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t5 ( | ||
3466 | 2207 | +a INT PRIMARY KEY AUTO_INCREMENT, | ||
3467 | 2208 | +b VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_bin | ||
3468 | 2209 | +) | ||
3469 | 2210 | +slave-bin.000001 # Query 1 # BEGIN | ||
3470 | 2211 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
3471 | 2212 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3472 | 2213 | +slave-bin.000001 # Query 1 # COMMIT | ||
3473 | 2214 | +slave-bin.000001 # Query 1 # BEGIN | ||
3474 | 2215 | +slave-bin.000001 # Annotate_rows 1 # UPDATE t1 SET b = b + 1 | ||
3475 | 2216 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
3476 | 2217 | +slave-bin.000001 # Update_rows 1 # table_id: # flags: STMT_END_F | ||
3477 | 2218 | +slave-bin.000001 # Query 1 # COMMIT | ||
3478 | 2219 | +slave-bin.000001 # Query 1 # BEGIN | ||
3479 | 2220 | +slave-bin.000001 # Annotate_rows 1 # REPLACE t1 VALUES (1,1), (2,2), (3,3) | ||
3480 | 2221 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
3481 | 2222 | +slave-bin.000001 # Update_rows 1 # table_id: # | ||
3482 | 2223 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3483 | 2224 | +slave-bin.000001 # Query 1 # COMMIT | ||
3484 | 2225 | +slave-bin.000001 # Query 1 # BEGIN | ||
3485 | 2226 | +slave-bin.000001 # Annotate_rows 1 # INSERT INTO t2 VALUES (1,1), (2,2), (3,3) | ||
3486 | 2227 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t2) | ||
3487 | 2228 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3488 | 2229 | +slave-bin.000001 # Query 1 # COMMIT | ||
3489 | 2230 | +slave-bin.000001 # Query 1 # BEGIN | ||
3490 | 2231 | +slave-bin.000001 # Annotate_rows 1 # INSERT INTO t3 VALUES (1,1), (2,2), (3,3) | ||
3491 | 2232 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t3) | ||
3492 | 2233 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3493 | 2234 | +slave-bin.000001 # Query 1 # COMMIT | ||
3494 | 2235 | +slave-bin.000001 # Query 1 # BEGIN | ||
3495 | 2236 | +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 | ||
3496 | 2237 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t2) | ||
3497 | 2238 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
3498 | 2239 | +slave-bin.000001 # Delete_rows 1 # table_id: # | ||
3499 | 2240 | +slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F | ||
3500 | 2241 | +slave-bin.000001 # Query 1 # COMMIT | ||
3501 | 2242 | +slave-bin.000001 # Query 1 # BEGIN | ||
3502 | 2243 | +slave-bin.000001 # Annotate_rows 1 # INSERT INTO t2 VALUES (1,1), (2,2), (3,3) | ||
3503 | 2244 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t2) | ||
3504 | 2245 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3505 | 2246 | +slave-bin.000001 # Query 1 # COMMIT | ||
3506 | 2247 | +slave-bin.000001 # Query 1 # BEGIN | ||
3507 | 2248 | +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 | ||
3508 | 2249 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t2) | ||
3509 | 2250 | +slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F | ||
3510 | 2251 | +slave-bin.000001 # Query 1 # COMMIT | ||
3511 | 2252 | +slave-bin.000001 # Query 1 # BEGIN | ||
3512 | 2253 | +slave-bin.000001 # Annotate_rows 1 # INSERT INTO t5(b) VALUES ('foo'), ('bar'), ('baz') | ||
3513 | 2254 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t5) | ||
3514 | 2255 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3515 | 2256 | +slave-bin.000001 # Query 1 # COMMIT | ||
3516 | 2257 | +slave-bin.000001 # Query 1 # BEGIN | ||
3517 | 2258 | +slave-bin.000001 # Annotate_rows 1 # INSERT INTO t5(b) VALUES ('gås') | ||
3518 | 2259 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t5) | ||
3519 | 2260 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3520 | 2261 | +slave-bin.000001 # Query 1 # COMMIT | ||
3521 | 2262 | +slave-bin.000001 # Query 1 # BEGIN | ||
3522 | 2263 | +slave-bin.000001 # Annotate_rows 1 # INSERT INTO t5(b) VALUES ('gås') | ||
3523 | 2264 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t5) | ||
3524 | 2265 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3525 | 2266 | +slave-bin.000001 # Query 1 # COMMIT | ||
3526 | 2267 | +slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4 | ||
3527 | 2268 | +# | ||
3528 | 2269 | +######################################################################## | ||
3529 | 2270 | +# INSERTs DELAYED ON MASTERs | ||
3530 | 2271 | +######################################################################## | ||
3531 | 2272 | +SET SESSION binlog_annotate_rows_events = ON; | ||
3532 | 2273 | +INSERT DELAYED INTO test1.t4 VALUES (1,1); | ||
3533 | 2274 | +FLUSH TABLES; | ||
3534 | 2275 | +SELECT * FROM test1.t4 ORDER BY a; | ||
3535 | 2276 | +a b | ||
3536 | 2277 | +1 1 | ||
3537 | 2278 | +######################################################################## | ||
3538 | 2279 | +# ON SLAVE | ||
3539 | 2280 | +# No Annotate_rows events should appear below | ||
3540 | 2281 | +######################################################################## | ||
3541 | 2282 | +FLUSH LOGS; | ||
3542 | 2283 | +include/rpl_end.inc | ||
3543 | 2284 | --- /dev/null | ||
3544 | 2285 | +++ b/mysql-test/suite/rpl/r/rpl_row_annotate_dont.result | ||
3545 | 2286 | @@ -0,0 +1,123 @@ | ||
3546 | 2287 | +include/master-slave.inc | ||
3547 | 2288 | +[connection master] | ||
3548 | 2289 | +######################################################################## | ||
3549 | 2290 | +# TABLES ON MASTER | ||
3550 | 2291 | +######################################################################## | ||
3551 | 2292 | +SELECT * FROM t1 ORDER BY a; | ||
3552 | 2293 | +a b | ||
3553 | 2294 | +0 1 | ||
3554 | 2295 | +SELECT * FROM t2 ORDER BY a; | ||
3555 | 2296 | +a b | ||
3556 | 2297 | +SELECT * FROM t3 ORDER BY a; | ||
3557 | 2298 | +a b | ||
3558 | 2299 | +1 1 | ||
3559 | 2300 | +2 2 | ||
3560 | 2301 | +3 3 | ||
3561 | 2302 | +SELECT * FROM t5 ORDER BY a; | ||
3562 | 2303 | +a b | ||
3563 | 2304 | +1 foo | ||
3564 | 2305 | +2 bar | ||
3565 | 2306 | +3 baz | ||
3566 | 2307 | +4 gås | ||
3567 | 2308 | +5 gås | ||
3568 | 2309 | +######################################################################## | ||
3569 | 2310 | +# TABLES ON SLAVE: should be the same as on master | ||
3570 | 2311 | +######################################################################## | ||
3571 | 2312 | +SELECT * FROM t1 ORDER BY a; | ||
3572 | 2313 | +a b | ||
3573 | 2314 | +0 1 | ||
3574 | 2315 | +SELECT * FROM t2 ORDER BY a; | ||
3575 | 2316 | +a b | ||
3576 | 2317 | +SELECT * FROM t3 ORDER BY a; | ||
3577 | 2318 | +a b | ||
3578 | 2319 | +1 1 | ||
3579 | 2320 | +2 2 | ||
3580 | 2321 | +3 3 | ||
3581 | 2322 | +SELECT * FROM t5 ORDER BY a; | ||
3582 | 2323 | +a b | ||
3583 | 2324 | +1 foo | ||
3584 | 2325 | +2 bar | ||
3585 | 2326 | +3 baz | ||
3586 | 2327 | +4 gås | ||
3587 | 2328 | +5 gås | ||
3588 | 2329 | +######################################################################## | ||
3589 | 2330 | +# EVENTS ON SLAVE | ||
3590 | 2331 | +# No Annotate_rows events should appear below | ||
3591 | 2332 | +######################################################################## | ||
3592 | 2333 | +FLUSH LOGS; | ||
3593 | 2334 | +show binlog events in 'slave-bin.000001' from <start_pos>; | ||
3594 | 2335 | +Log_name Pos Event_type Server_id End_log_pos Info | ||
3595 | 2336 | +slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test1 | ||
3596 | 2337 | +slave-bin.000001 # Query 1 # CREATE DATABASE test1 | ||
3597 | 2338 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t1(a int primary key, b int) | ||
3598 | 2339 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t2(a int, b int) | ||
3599 | 2340 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t3(a int, b int) | ||
3600 | 2341 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t4(a int, b int) | ||
3601 | 2342 | +slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t5 ( | ||
3602 | 2343 | +a INT PRIMARY KEY AUTO_INCREMENT, | ||
3603 | 2344 | +b VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_bin | ||
3604 | 2345 | +) | ||
3605 | 2346 | +slave-bin.000001 # Query 1 # BEGIN | ||
3606 | 2347 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
3607 | 2348 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3608 | 2349 | +slave-bin.000001 # Query 1 # COMMIT | ||
3609 | 2350 | +slave-bin.000001 # Query 1 # BEGIN | ||
3610 | 2351 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
3611 | 2352 | +slave-bin.000001 # Update_rows 1 # table_id: # flags: STMT_END_F | ||
3612 | 2353 | +slave-bin.000001 # Query 1 # COMMIT | ||
3613 | 2354 | +slave-bin.000001 # Query 1 # BEGIN | ||
3614 | 2355 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
3615 | 2356 | +slave-bin.000001 # Update_rows 1 # table_id: # | ||
3616 | 2357 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3617 | 2358 | +slave-bin.000001 # Query 1 # COMMIT | ||
3618 | 2359 | +slave-bin.000001 # Query 1 # BEGIN | ||
3619 | 2360 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t2) | ||
3620 | 2361 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3621 | 2362 | +slave-bin.000001 # Query 1 # COMMIT | ||
3622 | 2363 | +slave-bin.000001 # Query 1 # BEGIN | ||
3623 | 2364 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t3) | ||
3624 | 2365 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3625 | 2366 | +slave-bin.000001 # Query 1 # COMMIT | ||
3626 | 2367 | +slave-bin.000001 # Query 1 # BEGIN | ||
3627 | 2368 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t2) | ||
3628 | 2369 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t1) | ||
3629 | 2370 | +slave-bin.000001 # Delete_rows 1 # table_id: # | ||
3630 | 2371 | +slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F | ||
3631 | 2372 | +slave-bin.000001 # Query 1 # COMMIT | ||
3632 | 2373 | +slave-bin.000001 # Query 1 # BEGIN | ||
3633 | 2374 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t2) | ||
3634 | 2375 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3635 | 2376 | +slave-bin.000001 # Query 1 # COMMIT | ||
3636 | 2377 | +slave-bin.000001 # Query 1 # BEGIN | ||
3637 | 2378 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t2) | ||
3638 | 2379 | +slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F | ||
3639 | 2380 | +slave-bin.000001 # Query 1 # COMMIT | ||
3640 | 2381 | +slave-bin.000001 # Query 1 # BEGIN | ||
3641 | 2382 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t5) | ||
3642 | 2383 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3643 | 2384 | +slave-bin.000001 # Query 1 # COMMIT | ||
3644 | 2385 | +slave-bin.000001 # Query 1 # BEGIN | ||
3645 | 2386 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t5) | ||
3646 | 2387 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3647 | 2388 | +slave-bin.000001 # Query 1 # COMMIT | ||
3648 | 2389 | +slave-bin.000001 # Query 1 # BEGIN | ||
3649 | 2390 | +slave-bin.000001 # Table_map 1 # table_id: # (test1.t5) | ||
3650 | 2391 | +slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F | ||
3651 | 2392 | +slave-bin.000001 # Query 1 # COMMIT | ||
3652 | 2393 | +slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4 | ||
3653 | 2394 | +# | ||
3654 | 2395 | +######################################################################## | ||
3655 | 2396 | +# INSERTs DELAYED ON MASTERs | ||
3656 | 2397 | +######################################################################## | ||
3657 | 2398 | +SET SESSION binlog_annotate_rows_events = ON; | ||
3658 | 2399 | +INSERT DELAYED INTO test1.t4 VALUES (1,1); | ||
3659 | 2400 | +FLUSH TABLES; | ||
3660 | 2401 | +SELECT * FROM test1.t4 ORDER BY a; | ||
3661 | 2402 | +a b | ||
3662 | 2403 | +1 1 | ||
3663 | 2404 | +######################################################################## | ||
3664 | 2405 | +# ON SLAVE | ||
3665 | 2406 | +# No Annotate_rows events should appear below | ||
3666 | 2407 | +######################################################################## | ||
3667 | 2408 | +FLUSH LOGS; | ||
3668 | 2409 | +include/rpl_end.inc | ||
3669 | 2410 | --- a/mysql-test/suite/rpl/r/rpl_row_conflicts.result | ||
3670 | 2411 | +++ b/mysql-test/suite/rpl/r/rpl_row_conflicts.result | ||
3671 | 2412 | @@ -21,7 +21,7 @@ | ||
3672 | 2413 | [on slave] | ||
3673 | 2414 | ---- Wait until slave stops with an error ---- | ||
3674 | 2415 | include/wait_for_slave_sql_error.inc [errno=1062] | ||
3675 | 2416 | -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) | ||
3676 | 2417 | +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) | ||
3677 | 2418 | call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.* Error_code: 1062"); | ||
3678 | 2419 | SELECT * FROM t1; | ||
3679 | 2420 | a | ||
3680 | 2421 | --- /dev/null | ||
3681 | 2422 | +++ b/mysql-test/suite/rpl/t/percona_replicate_annotate_rows_events-master.opt | ||
3682 | 2423 | @@ -0,0 +1 @@ | ||
3683 | 2424 | +--binlog_annotate_rows_events --replicate_annotate_rows_events | ||
3684 | 2425 | --- /dev/null | ||
3685 | 2426 | +++ b/mysql-test/suite/rpl/t/percona_replicate_annotate_rows_events-slave.opt | ||
3686 | 2427 | @@ -0,0 +1 @@ | ||
3687 | 2428 | +--slave_net_timeout=1 --log_slave_updates=0 --binlog_annotate_rows_events --replicate_annotate_rows_events | ||
3688 | 2429 | --- /dev/null | ||
3689 | 2430 | +++ b/mysql-test/suite/rpl/t/percona_replicate_annotate_rows_events.test | ||
3690 | 2431 | @@ -0,0 +1,35 @@ | ||
3691 | 2432 | +######################################################################## | ||
3692 | 2433 | +# Bug #872754: Annotate rows events on slave doesnt' work without slave's binlog | ||
3693 | 2434 | +######################################################################## | ||
3694 | 2435 | + | ||
3695 | 2436 | +--source include/master-slave.inc | ||
3696 | 2437 | +--source include/have_binlog_format_row.inc | ||
3697 | 2438 | +--source include/have_debug.inc | ||
3698 | 2439 | + | ||
3699 | 2440 | +connection master; | ||
3700 | 2441 | +--disable_warnings | ||
3701 | 2442 | +DROP TABLE IF EXISTS t; | ||
3702 | 2443 | +--enable_warnings | ||
3703 | 2444 | + | ||
3704 | 2445 | +CREATE TABLE t (a INT); | ||
3705 | 2446 | +INSERT INTO t VALUES(1); | ||
3706 | 2447 | + | ||
3707 | 2448 | +--sleep 2 | ||
3708 | 2449 | + | ||
3709 | 2450 | +DROP TABLE t; | ||
3710 | 2451 | + | ||
3711 | 2452 | +# The following would hang with the bug not fixed | ||
3712 | 2453 | +--sync_slave_with_master | ||
3713 | 2454 | + | ||
3714 | 2455 | +connection master; | ||
3715 | 2456 | +--let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1) | ||
3716 | 2457 | +--eval select $master_log_pos | ||
3717 | 2458 | + | ||
3718 | 2459 | +connection slave; | ||
3719 | 2460 | +--let $read_master_log_pos= query_get_value(SHOW SLAVE STATUS, Read_Master_Log_Pos, 1) | ||
3720 | 2461 | +--eval select $master_log_pos = $read_master_log_pos | ||
3721 | 2462 | + | ||
3722 | 2463 | +--let $exec_master_log_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1) | ||
3723 | 2464 | +--eval select $master_log_pos = $exec_master_log_pos | ||
3724 | 2465 | + | ||
3725 | 2466 | +--source include/rpl_end.inc | ||
3726 | 2467 | --- /dev/null | ||
3727 | 2468 | +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do-slave.opt | ||
3728 | 2469 | @@ -0,0 +1 @@ | ||
3729 | 2470 | +--log-slave-updates --replicate-annotate-rows-events --replicate-ignore-table=test1.xt1 --replicate-ignore-table=test1.xt2 | ||
3730 | 2471 | \ No newline at end of file | ||
3731 | 2472 | --- /dev/null | ||
3732 | 2473 | +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do.test | ||
3733 | 2474 | @@ -0,0 +1,16 @@ | ||
3734 | 2475 | +############################################################################### | ||
3735 | 2476 | +# WL47: Store in binlog text of statements that caused RBR events | ||
3736 | 2477 | +# Wrapper for extra/rpl/rpl_row_annotate.test. | ||
3737 | 2478 | +# Intended to test that if the --replicate-annotate-rows-events option | ||
3738 | 2479 | +# is switched on on slave then Annotate_events: | ||
3739 | 2480 | +# - are reproduced on slave | ||
3740 | 2481 | +# - are reproduced only once for "multi-table-maps" rbr queries | ||
3741 | 2482 | +# - are not reproduced when the corresponding queries are filtered away | ||
3742 | 2483 | +# on replication | ||
3743 | 2484 | +# - are reproduced when the corresponding queries are filtered away partialy | ||
3744 | 2485 | +# (e.g. in case of multi-delete) | ||
3745 | 2486 | +# - are not generated on slave for queries that are not annotated on master. | ||
3746 | 2487 | +############################################################################### | ||
3747 | 2488 | + | ||
3748 | 2489 | +--source include/have_binlog_format_row.inc | ||
3749 | 2490 | +--source extra/rpl_tests/rpl_row_annotate.test | ||
3750 | 2491 | --- /dev/null | ||
3751 | 2492 | +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont-slave.opt | ||
3752 | 2493 | @@ -0,0 +1 @@ | ||
3753 | 2494 | +--log-slave-updates --replicate-ignore-table=test1.xt1 --replicate-ignore-table=test1.xt2 | ||
3754 | 2495 | \ No newline at end of file | ||
3755 | 2496 | --- /dev/null | ||
3756 | 2497 | +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test | ||
3757 | 2498 | @@ -0,0 +1,9 @@ | ||
3758 | 2499 | +############################################################################### | ||
3759 | 2500 | +# WL47: Store in binlog text of statements that caused RBR events | ||
3760 | 2501 | +# Wrapper for extra/rpl/rpl_row_annotate.test. | ||
3761 | 2502 | +# Intended to test that if the --replicate-annotate-rows-events option | ||
3762 | 2503 | +# is switched off on slave then Annotate_events are not reproduced. | ||
3763 | 2504 | +############################################################################### | ||
3764 | 2505 | + | ||
3765 | 2506 | +--source include/have_binlog_format_row.inc | ||
3766 | 2507 | +--source extra/rpl_tests/rpl_row_annotate.test | ||
3767 | 2508 | --- a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test | ||
3768 | 2509 | +++ b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test | ||
3769 | 2510 | @@ -1,7 +1,8 @@ | ||
3770 | 2511 | # depends on the binlog output | ||
3771 | 2512 | -- source include/have_binlog_format_row.inc | ||
3772 | 2513 | +--source include/binlog_start_pos.inc | ||
3773 | 2514 | |||
3774 | 2515 | -let $rename_event_pos= 897; | ||
3775 | 2516 | +let $rename_event_pos= `select @binlog_start_pos + 791`; | ||
3776 | 2517 | |||
3777 | 2518 | # Bug#18326: Do not lock table for writing during prepare of statement | ||
3778 | 2519 | # The use of the ps protocol causes extra table maps in the binlog, so | ||
3779 | 2520 | --- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test | ||
3780 | 2521 | +++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test | ||
3781 | 2522 | @@ -162,15 +162,18 @@ | ||
3782 | 2523 | |||
3783 | 2524 | remove_file $MYSQLTEST_VARDIR/tmp/master.sql; | ||
3784 | 2525 | |||
3785 | 2526 | +--source include/binlog_start_pos.inc | ||
3786 | 2527 | |||
3787 | 2528 | # this test for position option | ||
3788 | 2529 | -# By setting this position to 416, we should only get the create of t3 | ||
3789 | 2530 | +# By setting this position to start_binlog_pos + 310, we should only get the create of t3 | ||
3790 | 2531 | +let $start_pos= `select @binlog_start_pos + 310`; | ||
3791 | 2532 | +let $stop_pos= `select @binlog_start_pos + 463`; | ||
3792 | 2533 | --disable_query_log | ||
3793 | 2534 | select "--- Test 2 position test --" as ""; | ||
3794 | 2535 | --enable_query_log | ||
3795 | 2536 | let $MYSQLD_DATADIR= `select @@datadir;`; | ||
3796 | 2537 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3797 | 2538 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416 --stop-position=569 $MYSQLD_DATADIR/master-bin.000001 | ||
3798 | 2539 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=$start_pos --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 | ||
3799 | 2540 | |||
3800 | 2541 | # These are tests for remote binlog. | ||
3801 | 2542 | # They should return the same as previous test. | ||
3802 | 2543 | @@ -181,7 +184,7 @@ | ||
3803 | 2544 | |||
3804 | 2545 | # This is broken now | ||
3805 | 2546 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3806 | 2547 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --stop-position=569 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
3807 | 2548 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
3808 | 2549 | |||
3809 | 2550 | # This part is disabled due to bug #17654 | ||
3810 | 2551 | |||
3811 | 2552 | @@ -257,7 +260,7 @@ | ||
3812 | 2553 | select "--- Test 5 LOAD DATA --" as ""; | ||
3813 | 2554 | --enable_query_log | ||
3814 | 2555 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3815 | 2556 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --stop-position=106 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 | ||
3816 | 2557 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --stop-position=$binlog_start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 | ||
3817 | 2558 | |||
3818 | 2559 | # Bug#7853 (mysqlbinlog does not accept input from stdin) | ||
3819 | 2560 | |||
3820 | 2561 | @@ -265,14 +268,17 @@ | ||
3821 | 2562 | select "--- Test 6 reading stdin --" as ""; | ||
3822 | 2563 | --enable_query_log | ||
3823 | 2564 | let $MYSQLD_DATADIR= `select @@datadir;`; | ||
3824 | 2565 | +let $stop_pos= `select @binlog_start_pos + 463`; | ||
3825 | 2566 | --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR | ||
3826 | 2567 | ---exec $MYSQL_BINLOG --short-form --stop-position=569 - < $MYSQLD_DATADIR/master-bin.000001 | ||
3827 | 2568 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos - < $MYSQLD_DATADIR/master-bin.000001 | ||
3828 | 2569 | |||
3829 | 2570 | --disable_query_log | ||
3830 | 2571 | select "--- Test 7 reading stdin w/position --" as ""; | ||
3831 | 2572 | --enable_query_log | ||
3832 | 2573 | +let $start_pos= `select @binlog_start_pos + 310`; | ||
3833 | 2574 | +let $stop_pos= `select @binlog_start_pos + 463`; | ||
3834 | 2575 | --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR | ||
3835 | 2576 | ---exec $MYSQL_BINLOG --short-form --position=416 --stop-position=569 - < $MYSQLD_DATADIR/master-bin.000001 | ||
3836 | 2577 | +--exec $MYSQL_BINLOG --short-form --position=$start_pos --stop-position=$stop_pos - < $MYSQLD_DATADIR/master-bin.000001 | ||
3837 | 2578 | |||
3838 | 2579 | # Bug#16217 (mysql client did not know how not switch its internal charset) | ||
3839 | 2580 | --disable_query_log | ||
3840 | 2581 | --- a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test | ||
3841 | 2582 | +++ b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test | ||
3842 | 2583 | @@ -1,5 +1,6 @@ | ||
3843 | 2584 | # depends on the binlog output | ||
3844 | 2585 | --source include/have_binlog_format_mixed_or_statement.inc | ||
3845 | 2586 | +--source include/binlog_start_pos.inc | ||
3846 | 2587 | |||
3847 | 2588 | -let $rename_event_pos= 656; | ||
3848 | 2589 | +let $rename_event_pos= `select @binlog_start_pos + 550`; | ||
3849 | 2590 | -- source extra/rpl_tests/rpl_flsh_tbls.test | ||
3850 | 2591 | --- a/mysql-test/t/ctype_cp932_binlog_stm.test | ||
3851 | 2592 | +++ b/mysql-test/t/ctype_cp932_binlog_stm.test | ||
3852 | 2593 | @@ -28,16 +28,6 @@ | ||
3853 | 2594 | |||
3854 | 2595 | --echo End of 5.0 tests | ||
3855 | 2596 | |||
3856 | 2597 | -# | ||
3857 | 2598 | -# #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump | ||
3858 | 2599 | -# Note: 364 is a magic position (found experimentally, depends on | ||
3859 | 2600 | -# the log's contents) that caused the server crash. | ||
3860 | 2601 | - | ||
3861 | 2602 | -call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49"); | ||
3862 | 2603 | - | ||
3863 | 2604 | ---error 1220 | ||
3864 | 2605 | -SHOW BINLOG EVENTS FROM 365; | ||
3865 | 2606 | - | ||
3866 | 2607 | --echo Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment. | ||
3867 | 2608 | CREATE TABLE t1 (a varchar(16)) character set cp932; | ||
3868 | 2609 | INSERT INTO t1 VALUES (0x8372835E),(0x8352835E); | ||
3869 | 2610 | --- a/mysql-test/t/mysqlbinlog-master.opt | ||
3870 | 2611 | +++ b/mysql-test/t/mysqlbinlog-master.opt | ||
3871 | 2612 | @@ -1,2 +1 @@ | ||
3872 | 2613 | ---max-binlog-size=4096 | ||
3873 | 2614 | --force-restart | ||
3874 | 2615 | --- a/mysql-test/t/mysqlbinlog.test | ||
3875 | 2616 | +++ b/mysql-test/t/mysqlbinlog.test | ||
3876 | 2617 | @@ -3,10 +3,18 @@ | ||
3877 | 2618 | -- source include/have_binlog_format_statement.inc | ||
3878 | 2619 | |||
3879 | 2620 | -- source include/have_log_bin.inc | ||
3880 | 2621 | +-- source include/binlog_start_pos.inc | ||
3881 | 2622 | |||
3882 | 2623 | # Deletes all the binary logs | ||
3883 | 2624 | reset master; | ||
3884 | 2625 | |||
3885 | 2626 | +# We need small binlog size to break the last LOAD DATA INFILE below so that | ||
3886 | 2627 | +# the corresponding Begin_load_query will be written to master-bin.000001 | ||
3887 | 2628 | +# while the Execute_load_query will be written to master-bin.000002. | ||
3888 | 2629 | + | ||
3889 | 2630 | +SET @save_binlog_size= @@global.max_binlog_size; | ||
3890 | 2631 | +SET @@global.max_binlog_size= 4096; | ||
3891 | 2632 | + | ||
3892 | 2633 | # we need this for getting fixed timestamps inside of this test | ||
3893 | 2634 | set timestamp=1000000000; | ||
3894 | 2635 | |||
3895 | 2636 | @@ -26,13 +34,15 @@ | ||
3896 | 2637 | |||
3897 | 2638 | # test for load data and load data distributed among the several | ||
3898 | 2639 | # files (we need to fill up first binlog) | ||
3899 | 2640 | -load data infile '../../std_data/words.dat' into table t1; | ||
3900 | 2641 | -load data infile '../../std_data/words.dat' into table t1; | ||
3901 | 2642 | -load data infile '../../std_data/words.dat' into table t1; | ||
3902 | 2643 | -load data infile '../../std_data/words.dat' into table t1; | ||
3903 | 2644 | -load data infile '../../std_data/words.dat' into table t1; | ||
3904 | 2645 | +load data infile '../../std_data/words3.dat' into table t1; | ||
3905 | 2646 | +load data infile '../../std_data/words3.dat' into table t1; | ||
3906 | 2647 | +load data infile '../../std_data/words3.dat' into table t1; | ||
3907 | 2648 | +load data infile '../../std_data/words3.dat' into table t1; | ||
3908 | 2649 | +load data infile '../../std_data/words3.dat' into table t1; | ||
3909 | 2650 | # simple query to show more in second binlog | ||
3910 | 2651 | insert into t1 values ("Alas"); | ||
3911 | 2652 | + | ||
3912 | 2653 | +### Starting master-bin.000003 | ||
3913 | 2654 | flush logs; | ||
3914 | 2655 | |||
3915 | 2656 | # delimiters are for easier debugging in future | ||
3916 | 2657 | @@ -46,7 +56,7 @@ | ||
3917 | 2658 | # | ||
3918 | 2659 | let $MYSQLD_DATADIR= `select @@datadir`; | ||
3919 | 2660 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3920 | 2661 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
3921 | 2662 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
3922 | 2663 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000001 | ||
3923 | 2664 | |||
3924 | 2665 | # this should not fail but shouldn't produce any working statements | ||
3925 | 2666 | @@ -54,7 +64,7 @@ | ||
3926 | 2667 | select "--- Broken LOAD DATA --" as ""; | ||
3927 | 2668 | --enable_query_log | ||
3928 | 2669 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3929 | 2670 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
3930 | 2671 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
3931 | 2672 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000002 2> /dev/null | ||
3932 | 2673 | |||
3933 | 2674 | # this should show almost nothing | ||
3934 | 2675 | @@ -62,17 +72,17 @@ | ||
3935 | 2676 | select "--- --database --" as ""; | ||
3936 | 2677 | --enable_query_log | ||
3937 | 2678 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3938 | 2679 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
3939 | 2680 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
3940 | 2681 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLD_DATADIR/master-bin.000001 2> /dev/null | ||
3941 | 2682 | |||
3942 | 2683 | # this test for position option | ||
3943 | 2684 | --disable_query_log | ||
3944 | 2685 | select "--- --position --" as ""; | ||
3945 | 2686 | --enable_query_log | ||
3946 | 2687 | +let $start_pos= `select @binlog_start_pos + 227`; | ||
3947 | 2688 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3948 | 2689 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
3949 | 2690 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=332 $MYSQLD_DATADIR/master-bin.000002 | ||
3950 | 2691 | - | ||
3951 | 2692 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
3952 | 2693 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=$start_pos $MYSQLD_DATADIR/master-bin.000002 | ||
3953 | 2694 | |||
3954 | 2695 | # These are tests for remote binlog. | ||
3955 | 2696 | # They should return the same as previous test. | ||
3956 | 2697 | @@ -83,7 +93,7 @@ | ||
3957 | 2698 | |||
3958 | 2699 | # This is broken now | ||
3959 | 2700 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3960 | 2701 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
3961 | 2702 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
3962 | 2703 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
3963 | 2704 | |||
3964 | 2705 | # This is broken too | ||
3965 | 2706 | @@ -91,7 +101,7 @@ | ||
3966 | 2707 | select "--- Broken LOAD DATA --" as ""; | ||
3967 | 2708 | --enable_query_log | ||
3968 | 2709 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3969 | 2710 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
3970 | 2711 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
3971 | 2712 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 2> /dev/null | ||
3972 | 2713 | |||
3973 | 2714 | # And this too ! (altough it is documented) | ||
3974 | 2715 | @@ -99,34 +109,39 @@ | ||
3975 | 2716 | select "--- --database --" as ""; | ||
3976 | 2717 | --enable_query_log | ||
3977 | 2718 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3978 | 2719 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
3979 | 2720 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
3980 | 2721 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001 2> /dev/null | ||
3981 | 2722 | |||
3982 | 2723 | # Strangely but this works | ||
3983 | 2724 | --disable_query_log | ||
3984 | 2725 | select "--- --position --" as ""; | ||
3985 | 2726 | --enable_query_log | ||
3986 | 2727 | +let $start_pos= `select @binlog_start_pos + 227`; | ||
3987 | 2728 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
3988 | 2729 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
3989 | 2730 | ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=332 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 | ||
3990 | 2731 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
3991 | 2732 | +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=$start_pos --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 | ||
3992 | 2733 | |||
3993 | 2734 | # Bug#7853 mysqlbinlog does not accept input from stdin | ||
3994 | 2735 | --disable_query_log | ||
3995 | 2736 | select "--- reading stdin --" as ""; | ||
3996 | 2737 | --enable_query_log | ||
3997 | 2738 | --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR | ||
3998 | 2739 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
3999 | 2740 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
4000 | 2741 | --exec $MYSQL_BINLOG --short-form - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001 | ||
4001 | 2742 | |||
4002 | 2743 | --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR | ||
4003 | 2744 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
4004 | 2745 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
4005 | 2746 | --exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001 | ||
4006 | 2747 | drop table t1,t2; | ||
4007 | 2748 | |||
4008 | 2749 | +SET @@global.max_binlog_size= @save_binlog_size; | ||
4009 | 2750 | + | ||
4010 | 2751 | # | ||
4011 | 2752 | # Bug#14157 utf8 encoding in binlog without set character_set_client | ||
4012 | 2753 | # | ||
4013 | 2754 | +### Starting master-bin.000004 | ||
4014 | 2755 | flush logs; | ||
4015 | 2756 | + | ||
4016 | 2757 | --write_file $MYSQLTEST_VARDIR/tmp/bug14157.sql | ||
4017 | 2758 | create table if not exists t5 (a int); | ||
4018 | 2759 | set names latin1; | ||
4019 | 2760 | @@ -140,6 +155,8 @@ | ||
4020 | 2761 | # resulted binlog, parly consisting of multi-byte utf8 chars, | ||
4021 | 2762 | # must be digestable for both client and server. In 4.1 the client | ||
4022 | 2763 | # should use default-character-set same as the server. | ||
4023 | 2764 | + | ||
4024 | 2765 | +### Starting master-bin.000005 | ||
4025 | 2766 | flush logs; | ||
4026 | 2767 | --exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000004 | $MYSQL | ||
4027 | 2768 | select * from t5 /* must be (1),(1) */; | ||
4028 | 2769 | @@ -150,6 +167,8 @@ | ||
4029 | 2770 | # Check that a dump created by mysqlbinlog reproduces | ||
4030 | 2771 | # lc_time_names dependent values correctly | ||
4031 | 2772 | # | ||
4032 | 2773 | + | ||
4033 | 2774 | +### Starting master-bin.000006 | ||
4034 | 2775 | flush logs; | ||
4035 | 2776 | create table t5 (c1 int, c2 varchar(128) character set latin1 not null); | ||
4036 | 2777 | insert into t5 values (1, date_format('2001-01-01','%W')); | ||
4037 | 2778 | @@ -158,7 +177,10 @@ | ||
4038 | 2779 | set lc_time_names=en_US; | ||
4039 | 2780 | insert into t5 values (3, date_format('2001-01-01','%W')); | ||
4040 | 2781 | select * from t5 order by c1; | ||
4041 | 2782 | + | ||
4042 | 2783 | +### Starting master-bin.000007 | ||
4043 | 2784 | flush logs; | ||
4044 | 2785 | + | ||
4045 | 2786 | drop table t5; | ||
4046 | 2787 | --exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000006 | $MYSQL | ||
4047 | 2788 | select * from t5 order by c1; | ||
4048 | 2789 | @@ -170,7 +192,10 @@ | ||
4049 | 2790 | --disable_warnings | ||
4050 | 2791 | drop procedure if exists p1; | ||
4051 | 2792 | --enable_warnings | ||
4052 | 2793 | + | ||
4053 | 2794 | +### Starting master-bin.000008 | ||
4054 | 2795 | flush logs; | ||
4055 | 2796 | + | ||
4056 | 2797 | delimiter //; | ||
4057 | 2798 | create procedure p1() | ||
4058 | 2799 | begin | ||
4059 | 2800 | @@ -178,12 +203,15 @@ | ||
4060 | 2801 | end; | ||
4061 | 2802 | // | ||
4062 | 2803 | delimiter ;// | ||
4063 | 2804 | + | ||
4064 | 2805 | +### Starting master-bin.000009 | ||
4065 | 2806 | flush logs; | ||
4066 | 2807 | + | ||
4067 | 2808 | call p1(); | ||
4068 | 2809 | drop procedure p1; | ||
4069 | 2810 | --error ER_SP_DOES_NOT_EXIST | ||
4070 | 2811 | call p1(); | ||
4071 | 2812 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
4072 | 2813 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
4073 | 2814 | --exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000008 | ||
4074 | 2815 | --exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000008 | $MYSQL | ||
4075 | 2816 | call p1(); | ||
4076 | 2817 | @@ -202,7 +230,9 @@ | ||
4077 | 2818 | # (LOAD DATA INFILE need it) | ||
4078 | 2819 | # | ||
4079 | 2820 | |||
4080 | 2821 | +### Starting master-bin.000010 | ||
4081 | 2822 | flush logs; | ||
4082 | 2823 | + | ||
4083 | 2824 | create table t1 (a varchar(64) character set utf8); | ||
4084 | 2825 | load data infile '../../std_data/loaddata6.dat' into table t1; | ||
4085 | 2826 | set character_set_database=koi8r; | ||
4086 | 2827 | @@ -217,9 +247,12 @@ | ||
4087 | 2828 | load data infile '../../std_data/loaddata6.dat' into table t1 character set koi8r; | ||
4088 | 2829 | select hex(a) from t1; | ||
4089 | 2830 | drop table t1; | ||
4090 | 2831 | + | ||
4091 | 2832 | +### Starting master-bin.000011 | ||
4092 | 2833 | flush logs; | ||
4093 | 2834 | + | ||
4094 | 2835 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
4095 | 2836 | ---replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ | ||
4096 | 2837 | +--replace_regex /SQL_LOAD_MB-[0-9a-f]+-[0-9a-f]+/SQL_LOAD_MB-#-#/ | ||
4097 | 2838 | --exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000010 | ||
4098 | 2839 | |||
4099 | 2840 | # | ||
4100 | 2841 | @@ -229,9 +262,14 @@ | ||
4101 | 2842 | |||
4102 | 2843 | CREATE TABLE t1 (c1 CHAR(10)); | ||
4103 | 2844 | # we need this for getting fixed timestamps inside of this test | ||
4104 | 2845 | +### Starting master-bin.000012 | ||
4105 | 2846 | FLUSH LOGS; | ||
4106 | 2847 | + | ||
4107 | 2848 | INSERT INTO t1 VALUES ('0123456789'); | ||
4108 | 2849 | + | ||
4109 | 2850 | +### Starting master-bin.000013 | ||
4110 | 2851 | FLUSH LOGS; | ||
4111 | 2852 | + | ||
4112 | 2853 | DROP TABLE t1; | ||
4113 | 2854 | |||
4114 | 2855 | # We create a table, patch, and load the output into it | ||
4115 | 2856 | @@ -257,11 +295,16 @@ | ||
4116 | 2857 | # | ||
4117 | 2858 | # Bug#29928 incorrect connection_id() restoring from mysqlbinlog out | ||
4118 | 2859 | # | ||
4119 | 2860 | +### Starting master-bin.000014 | ||
4120 | 2861 | FLUSH LOGS; | ||
4121 | 2862 | + | ||
4122 | 2863 | CREATE TABLE t1(a INT); | ||
4123 | 2864 | INSERT INTO t1 VALUES(connection_id()); | ||
4124 | 2865 | let $a= `SELECT a FROM t1`; | ||
4125 | 2866 | + | ||
4126 | 2867 | +### Starting master-bin.000015 | ||
4127 | 2868 | FLUSH LOGS; | ||
4128 | 2869 | + | ||
4129 | 2870 | let $outfile= $MYSQLTEST_VARDIR/tmp/bug29928.sql; | ||
4130 | 2871 | --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000014 > $outfile | ||
4131 | 2872 | DROP TABLE t1; | ||
4132 | 2873 | @@ -281,11 +324,12 @@ | ||
4133 | 2874 | exec $MYSQL_BINLOG $MYSQL_TEST_DIR/std_data/corrupt-relay-bin.000624 > $MYSQLTEST_VARDIR/tmp/bug31793.sql; | ||
4134 | 2875 | --remove_file $MYSQLTEST_VARDIR/tmp/bug31793.sql | ||
4135 | 2876 | |||
4136 | 2877 | - | ||
4137 | 2878 | # | ||
4138 | 2879 | # Test --disable-force-if-open and --force-if-open | ||
4139 | 2880 | # | ||
4140 | 2881 | +### Starting master-bin.000016 | ||
4141 | 2882 | FLUSH LOGS; | ||
4142 | 2883 | + | ||
4143 | 2884 | --error 1 | ||
4144 | 2885 | --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000016 >/dev/null 2>/dev/null | ||
4145 | 2886 | --exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000016 >/dev/null 2>/dev/null | ||
4146 | 2887 | @@ -300,9 +344,15 @@ | ||
4147 | 2888 | SHOW GRANTS FOR untrusted@localhost; | ||
4148 | 2889 | USE mysqltest1; | ||
4149 | 2890 | CREATE TABLE t1 (a INT, b CHAR(64)); | ||
4150 | 2891 | + | ||
4151 | 2892 | +### Starting master-bin.000017 | ||
4152 | 2893 | flush logs; | ||
4153 | 2894 | + | ||
4154 | 2895 | INSERT INTO t1 VALUES (1,USER()); | ||
4155 | 2896 | + | ||
4156 | 2897 | +### Starting master-bin.000018 | ||
4157 | 2898 | flush logs; | ||
4158 | 2899 | + | ||
4159 | 2900 | echo mysqlbinlog var/log/master-bin.000017 > var/tmp/bug31611.sql; | ||
4160 | 2901 | exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000017 > $MYSQLTEST_VARDIR/tmp/bug31611.sql; | ||
4161 | 2902 | connect (unsecure,localhost,untrusted,,mysqltest1); | ||
4162 | 2903 | @@ -326,14 +376,20 @@ | ||
4163 | 2904 | connection default; | ||
4164 | 2905 | USE test; | ||
4165 | 2906 | SET BINLOG_FORMAT = STATEMENT; | ||
4166 | 2907 | + | ||
4167 | 2908 | +### Starting master-bin.000019 | ||
4168 | 2909 | FLUSH LOGS; | ||
4169 | 2910 | + | ||
4170 | 2911 | CREATE TABLE t1 (a_real FLOAT, an_int INT, a_decimal DECIMAL(5,2), a_string CHAR(32)); | ||
4171 | 2912 | SET @a_real = rand(20) * 1000; | ||
4172 | 2913 | SET @an_int = 1000; | ||
4173 | 2914 | SET @a_decimal = CAST(rand(19) * 999 AS DECIMAL(5,2)); | ||
4174 | 2915 | SET @a_string = 'Just a test'; | ||
4175 | 2916 | INSERT INTO t1 VALUES (@a_real, @an_int, @a_decimal, @a_string); | ||
4176 | 2917 | + | ||
4177 | 2918 | +### Starting master-bin.000020 | ||
4178 | 2919 | FLUSH LOGS; | ||
4179 | 2920 | + | ||
4180 | 2921 | query_vertical SELECT * FROM t1; | ||
4181 | 2922 | DROP TABLE t1; | ||
4182 | 2923 | |||
4183 | 2924 | @@ -357,6 +413,7 @@ | ||
4184 | 2925 | |||
4185 | 2926 | RESET MASTER; | ||
4186 | 2927 | FLUSH LOGS; | ||
4187 | 2928 | + | ||
4188 | 2929 | --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $binlog_file | ||
4189 | 2930 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR | ||
4190 | 2931 | eval SELECT | ||
4191 | 2932 | --- a/mysql-test/t/mysqlbinlog2.test | ||
4192 | 2933 | +++ b/mysql-test/t/mysqlbinlog2.test | ||
4193 | 2934 | @@ -3,7 +3,7 @@ | ||
4194 | 2935 | |||
4195 | 2936 | # TODO: Need to look at making row based version once new binlog client is complete. | ||
4196 | 2937 | -- source include/have_binlog_format_mixed_or_statement.inc | ||
4197 | 2938 | - | ||
4198 | 2939 | +-- source include/binlog_start_pos.inc | ||
4199 | 2940 | |||
4200 | 2941 | --disable_warnings | ||
4201 | 2942 | drop table if exists t1; | ||
4202 | 2943 | @@ -50,15 +50,19 @@ | ||
4203 | 2944 | --disable_query_log | ||
4204 | 2945 | select "--- start-position --" as ""; | ||
4205 | 2946 | --enable_query_log | ||
4206 | 2947 | ---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLD_DATADIR/master-bin.000001 | ||
4207 | 2948 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
4208 | 2949 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 | ||
4209 | 2950 | --disable_query_log | ||
4210 | 2951 | select "--- stop-position --" as ""; | ||
4211 | 2952 | --enable_query_log | ||
4212 | 2953 | ---exec $MYSQL_BINLOG --short-form --stop-position=608 $MYSQLD_DATADIR/master-bin.000001 | ||
4213 | 2954 | +let $stop_pos= `select @binlog_start_pos + 502`; | ||
4214 | 2955 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 | ||
4215 | 2956 | --disable_query_log | ||
4216 | 2957 | select "--- start and stop positions ---" as ""; | ||
4217 | 2958 | --enable_query_log | ||
4218 | 2959 | ---exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 $MYSQLD_DATADIR/master-bin.000001 | ||
4219 | 2960 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
4220 | 2961 | +let $stop_pos= `select @binlog_start_pos + 619`; | ||
4221 | 2962 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position $stop_pos $MYSQLD_DATADIR/master-bin.000001 | ||
4222 | 2963 | --disable_query_log | ||
4223 | 2964 | select "--- start-datetime --" as ""; | ||
4224 | 2965 | --enable_query_log | ||
4225 | 2966 | @@ -84,11 +88,13 @@ | ||
4226 | 2967 | --disable_query_log | ||
4227 | 2968 | select "--- start-position --" as ""; | ||
4228 | 2969 | --enable_query_log | ||
4229 | 2970 | ---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 | ||
4230 | 2971 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
4231 | 2972 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 | ||
4232 | 2973 | --disable_query_log | ||
4233 | 2974 | select "--- stop-position --" as ""; | ||
4234 | 2975 | --enable_query_log | ||
4235 | 2976 | ---exec $MYSQL_BINLOG --short-form --stop-position=134 $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 | ||
4236 | 2977 | +let $stop_pos= `select @binlog_start_pos + 28`; | ||
4237 | 2978 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002 | ||
4238 | 2979 | --disable_query_log | ||
4239 | 2980 | select "--- start-datetime --" as ""; | ||
4240 | 2981 | --enable_query_log | ||
4241 | 2982 | @@ -111,15 +117,19 @@ | ||
4242 | 2983 | --disable_query_log | ||
4243 | 2984 | select "--- start-position --" as ""; | ||
4244 | 2985 | --enable_query_log | ||
4245 | 2986 | ---exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
4246 | 2987 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
4247 | 2988 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
4248 | 2989 | --disable_query_log | ||
4249 | 2990 | select "--- stop-position --" as ""; | ||
4250 | 2991 | --enable_query_log | ||
4251 | 2992 | ---exec $MYSQL_BINLOG --short-form --stop-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
4252 | 2993 | +let $stop_pos= `select @binlog_start_pos + 502`; | ||
4253 | 2994 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
4254 | 2995 | --disable_query_log | ||
4255 | 2996 | select "--- start and stop positions ---" as ""; | ||
4256 | 2997 | --enable_query_log | ||
4257 | 2998 | ---exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
4258 | 2999 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
4259 | 3000 | +let $stop_pos= `select @binlog_start_pos + 619`; | ||
4260 | 3001 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --stop-position $stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 | ||
4261 | 3002 | --disable_query_log | ||
4262 | 3003 | select "--- start-datetime --" as ""; | ||
4263 | 3004 | --enable_query_log | ||
4264 | 3005 | @@ -142,11 +152,13 @@ | ||
4265 | 3006 | --disable_query_log | ||
4266 | 3007 | select "--- start-position --" as ""; | ||
4267 | 3008 | --enable_query_log | ||
4268 | 3009 | ---exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 | ||
4269 | 3010 | +let $start_pos= `select @binlog_start_pos + 502`; | ||
4270 | 3011 | +--exec $MYSQL_BINLOG --short-form --start-position=$start_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 | ||
4271 | 3012 | --disable_query_log | ||
4272 | 3013 | select "--- stop-position --" as ""; | ||
4273 | 3014 | --enable_query_log | ||
4274 | 3015 | ---exec $MYSQL_BINLOG --short-form --stop-position=134 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 | ||
4275 | 3016 | +let $stop_pos= `select @binlog_start_pos + 28`; | ||
4276 | 3017 | +--exec $MYSQL_BINLOG --short-form --stop-position=$stop_pos --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 | ||
4277 | 3018 | --disable_query_log | ||
4278 | 3019 | select "--- start-datetime --" as ""; | ||
4279 | 3020 | --enable_query_log | ||
4280 | 217 | --- a/sql/handler.cc | 3021 | --- a/sql/handler.cc |
4281 | 218 | +++ b/sql/handler.cc | 3022 | +++ b/sql/handler.cc |
4282 | 219 | @@ -4625,7 +4625,8 @@ | 3023 | @@ -4625,7 +4625,8 @@ |
4283 | @@ -263,7 +3067,7 @@ | |||
4284 | 263 | { | 3067 | { |
4285 | 264 | int error; | 3068 | int error; |
4286 | 265 | DBUG_ENTER("THD::binlog_write_table_map"); | 3069 | DBUG_ENTER("THD::binlog_write_table_map"); |
4288 | 266 | @@ -4317,7 +4319,7 @@ | 3070 | @@ -4317,7 +4320,7 @@ |
4289 | 267 | if (is_trans && binlog_table_maps == 0) | 3071 | if (is_trans && binlog_table_maps == 0) |
4290 | 268 | binlog_start_trans_and_stmt(); | 3072 | binlog_start_trans_and_stmt(); |
4291 | 269 | 3073 | ||
4292 | @@ -272,7 +3076,7 @@ | |||
4293 | 272 | DBUG_RETURN(error); | 3076 | DBUG_RETURN(error); |
4294 | 273 | 3077 | ||
4295 | 274 | binlog_table_maps++; | 3078 | binlog_table_maps++; |
4297 | 275 | @@ -4447,10 +4449,12 @@ | 3079 | @@ -4447,10 +4450,12 @@ |
4298 | 276 | } | 3080 | } |
4299 | 277 | 3081 | ||
4300 | 278 | /** | 3082 | /** |
4301 | @@ -287,7 +3091,7 @@ | |||
4302 | 287 | { | 3091 | { |
4303 | 288 | THD *thd= event_info->thd; | 3092 | THD *thd= event_info->thd; |
4304 | 289 | bool error= 1; | 3093 | bool error= 1; |
4306 | 290 | @@ -4631,6 +4635,16 @@ | 3094 | @@ -4631,6 +4636,16 @@ |
4307 | 291 | } | 3095 | } |
4308 | 292 | } | 3096 | } |
4309 | 293 | 3097 | ||
4310 | @@ -304,6 +3108,17 @@ | |||
4311 | 304 | /* | 3108 | /* |
4312 | 305 | Write the SQL command | 3109 | Write the SQL command |
4313 | 306 | */ | 3110 | */ |
4314 | 3111 | --- a/sql/log.h | ||
4315 | 3112 | +++ b/sql/log.h | ||
4316 | 3113 | @@ -359,7 +359,7 @@ | ||
4317 | 3114 | int new_file(); | ||
4318 | 3115 | |||
4319 | 3116 | void reset_gathered_updates(THD *thd); | ||
4320 | 3117 | - bool write(Log_event* event_info); // binary log write | ||
4321 | 3118 | + bool write(Log_event *event_info, my_bool *with_annotate= 0); // binary log write | ||
4322 | 3119 | bool write(THD *thd, IO_CACHE *cache, Log_event *commit_event, bool incident); | ||
4323 | 3120 | |||
4324 | 3121 | bool write_incident(THD *thd, bool lock); | ||
4325 | 307 | --- a/sql/log_event.cc | 3122 | --- a/sql/log_event.cc |
4326 | 308 | +++ b/sql/log_event.cc | 3123 | +++ b/sql/log_event.cc |
4327 | 309 | @@ -656,6 +656,7 @@ | 3124 | @@ -656,6 +656,7 @@ |
4328 | @@ -319,7 +3134,7 @@ | |||
4329 | 319 | */ | 3134 | */ |
4330 | 320 | if (description_event->binlog_version==3 && | 3135 | if (description_event->binlog_version==3 && |
4331 | 321 | - buf[EVENT_TYPE_OFFSET]<FORMAT_DESCRIPTION_EVENT && log_pos) | 3136 | - buf[EVENT_TYPE_OFFSET]<FORMAT_DESCRIPTION_EVENT && log_pos) |
4333 | 322 | + (uchar)buf[EVENT_TYPE_OFFSET]<FORMAT_DESCRIPTION_EVENT && log_pos) | 3137 | + (uchar)buf[EVENT_TYPE_OFFSET] < FORMAT_DESCRIPTION_EVENT && log_pos) |
4334 | 323 | { | 3138 | { |
4335 | 324 | /* | 3139 | /* |
4336 | 325 | If log_pos=0, don't change it. log_pos==0 is a marker to mean | 3140 | If log_pos=0, don't change it. log_pos==0 is a marker to mean |
4337 | @@ -487,9 +3302,9 @@ | |||
4338 | 487 | + print_header(&pinfo->head_cache, pinfo, TRUE); | 3302 | + print_header(&pinfo->head_cache, pinfo, TRUE); |
4339 | 488 | + my_b_printf(&pinfo->head_cache, "\tAnnotate_rows:\n"); | 3303 | + my_b_printf(&pinfo->head_cache, "\tAnnotate_rows:\n"); |
4340 | 489 | + | 3304 | + |
4344 | 490 | + char *pbeg; // beginning of the next line | 3305 | + char *pbeg; // beginning of the next line |
4345 | 491 | + char *pend; // end of the next line | 3306 | + char *pend; // end of the next line |
4346 | 492 | + uint cnt= 0; // characters counter | 3307 | + uint cnt= 0; // characters counter |
4347 | 493 | + | 3308 | + |
4348 | 494 | + for (pbeg= m_query_txt; ; pbeg= pend) | 3309 | + for (pbeg= m_query_txt; ; pbeg= pend) |
4349 | 495 | + { | 3310 | + { |
4350 | @@ -506,7 +3321,7 @@ | |||
4351 | 506 | + // find end of the next line | 3321 | + // find end of the next line |
4352 | 507 | + for (pend= pbeg + 1; | 3322 | + for (pend= pbeg + 1; |
4353 | 508 | + ++cnt <= m_query_len && *pend != '\r' && *pend != '\n'; | 3323 | + ++cnt <= m_query_len && *pend != '\r' && *pend != '\n'; |
4355 | 509 | + pend++) ; | 3324 | + pend++) {}; |
4356 | 510 | + | 3325 | + |
4357 | 511 | + // print next line | 3326 | + // print next line |
4358 | 512 | + my_b_write(&pinfo->head_cache, (const uchar*) "#Q> ", 4); | 3327 | + my_b_write(&pinfo->head_cache, (const uchar*) "#Q> ", 4); |
4359 | @@ -632,18 +3447,20 @@ | |||
4360 | 632 | @class Table_map_log_event | 3447 | @class Table_map_log_event |
4361 | 633 | 3448 | ||
4362 | 634 | In row-based mode, every row operation event is preceded by a | 3449 | In row-based mode, every row operation event is preceded by a |
4375 | 635 | --- a/sql/log.h | 3450 | --- a/sql/mysql_priv.h |
4376 | 636 | +++ b/sql/log.h | 3451 | +++ b/sql/mysql_priv.h |
4377 | 637 | @@ -359,7 +359,8 @@ | 3452 | @@ -615,7 +615,11 @@ |
4378 | 638 | int new_file(); | 3453 | /* BINLOG_DUMP options */ |
4379 | 639 | 3454 | ||
4380 | 640 | void reset_gathered_updates(THD *thd); | 3455 | #define BINLOG_DUMP_NON_BLOCK 1 |
4381 | 641 | - bool write(Log_event* event_info); // binary log write | 3456 | +#endif /* !MYSQL_CLIENT */ |
4382 | 642 | + bool write(Log_event* event_info, | 3457 | |
4383 | 643 | + my_bool *with_annotate= 0); // binary log write | 3458 | +#define BINLOG_SEND_ANNOTATE_ROWS_EVENT 2 |
4384 | 644 | bool write(THD *thd, IO_CACHE *cache, Log_event *commit_event, bool incident); | 3459 | + |
4385 | 645 | 3460 | +#ifndef MYSQL_CLIENT | |
4386 | 646 | bool write_incident(THD *thd, bool lock); | 3461 | /* sql_show.cc:show_log_files() */ |
4387 | 3462 | #define SHOW_LOG_STATUS_FREE "FREE" | ||
4388 | 3463 | #define SHOW_LOG_STATUS_INUSE "IN USE" | ||
4389 | 647 | --- a/sql/mysqld.cc | 3464 | --- a/sql/mysqld.cc |
4390 | 648 | +++ b/sql/mysqld.cc | 3465 | +++ b/sql/mysqld.cc |
4391 | 649 | @@ -504,6 +504,7 @@ | 3466 | @@ -504,6 +504,7 @@ |
4392 | @@ -682,20 +3499,6 @@ | |||
4393 | 682 | {"binlog-do-db", OPT_BINLOG_DO_DB, | 3499 | {"binlog-do-db", OPT_BINLOG_DO_DB, |
4394 | 683 | "Tells the master it should log updates for the specified database, " | 3500 | "Tells the master it should log updates for the specified database, " |
4395 | 684 | "and exclude all others not explicitly mentioned.", | 3501 | "and exclude all others not explicitly mentioned.", |
4396 | 685 | --- a/sql/mysql_priv.h | ||
4397 | 686 | +++ b/sql/mysql_priv.h | ||
4398 | 687 | @@ -615,7 +615,11 @@ | ||
4399 | 688 | /* BINLOG_DUMP options */ | ||
4400 | 689 | |||
4401 | 690 | #define BINLOG_DUMP_NON_BLOCK 1 | ||
4402 | 691 | +#endif /* !MYSQL_CLIENT */ | ||
4403 | 692 | |||
4404 | 693 | +#define BINLOG_SEND_ANNOTATE_ROWS_EVENT 2 | ||
4405 | 694 | + | ||
4406 | 695 | +#ifndef MYSQL_CLIENT | ||
4407 | 696 | /* sql_show.cc:show_log_files() */ | ||
4408 | 697 | #define SHOW_LOG_STATUS_FREE "FREE" | ||
4409 | 698 | #define SHOW_LOG_STATUS_INUSE "IN USE" | ||
4410 | 699 | --- a/sql/rpl_rli.cc | 3502 | --- a/sql/rpl_rli.cc |
4411 | 700 | +++ b/sql/rpl_rli.cc | 3503 | +++ b/sql/rpl_rli.cc |
4412 | 701 | @@ -45,7 +45,8 @@ | 3504 | @@ -45,7 +45,8 @@ |
4413 | @@ -773,7 +3576,7 @@ | |||
4414 | 773 | static sys_var_const_os_str sys_basedir(&vars, "basedir", mysql_home); | 3576 | static sys_var_const_os_str sys_basedir(&vars, "basedir", mysql_home); |
4415 | 774 | +static sys_var_thd_bool | 3577 | +static sys_var_thd_bool |
4416 | 775 | +sys_binlog_annotate_rows_events(&vars, "binlog_annotate_rows_events", | 3578 | +sys_binlog_annotate_rows_events(&vars, "binlog_annotate_rows_events", |
4418 | 776 | + &SV::binlog_annotate_rows_events); | 3579 | + &SV::binlog_annotate_rows_events); |
4419 | 777 | static sys_var_long_ptr sys_binlog_cache_size(&vars, "binlog_cache_size", | 3580 | static sys_var_long_ptr sys_binlog_cache_size(&vars, "binlog_cache_size", |
4420 | 778 | &binlog_cache_size); | 3581 | &binlog_cache_size); |
4421 | 779 | static sys_var_thd_binlog_format sys_binlog_format(&vars, "binlog_format", | 3582 | static sys_var_thd_binlog_format sys_binlog_format(&vars, "binlog_format", |
4422 | @@ -789,7 +3592,7 @@ | |||
4423 | 789 | // TODO if big log files: Change next to int8store() | 3592 | // TODO if big log files: Change next to int8store() |
4424 | 790 | int4store(buf, (ulong) mi->master_log_pos); | 3593 | int4store(buf, (ulong) mi->master_log_pos); |
4425 | 791 | int2store(buf + 4, binlog_flags); | 3594 | int2store(buf + 4, binlog_flags); |
4427 | 792 | @@ -2311,17 +2314,41 @@ | 3595 | @@ -2311,15 +2314,39 @@ |
4428 | 793 | } | 3596 | } |
4429 | 794 | exec_res= apply_event_and_update_pos(ev, thd, rli); | 3597 | exec_res= apply_event_and_update_pos(ev, thd, rli); |
4430 | 795 | 3598 | ||
4431 | @@ -802,7 +3605,8 @@ | |||
4432 | 802 | - { | 3605 | - { |
4433 | 803 | - DBUG_PRINT("info", ("Deleting the event after it has been executed")); | 3606 | - DBUG_PRINT("info", ("Deleting the event after it has been executed")); |
4434 | 804 | - delete ev; | 3607 | - delete ev; |
4436 | 805 | + switch (ev->get_type_code()) { | 3608 | + switch (ev->get_type_code()) |
4437 | 3609 | + { | ||
4438 | 806 | + case FORMAT_DESCRIPTION_EVENT: | 3610 | + case FORMAT_DESCRIPTION_EVENT: |
4439 | 807 | + /* | 3611 | + /* |
4440 | 808 | + Format_description_log_event should not be deleted because it | 3612 | + Format_description_log_event should not be deleted because it |
4441 | @@ -836,11 +3640,8 @@ | |||
4442 | 836 | + break; | 3640 | + break; |
4443 | 837 | } | 3641 | } |
4444 | 838 | 3642 | ||
4445 | 839 | + | ||
4446 | 840 | /* | 3643 | /* |
4450 | 841 | update_log_pos failed: this should not happen, so we don't | 3644 | @@ -2947,6 +2973,12 @@ |
4448 | 842 | retry. | ||
4449 | 843 | @@ -2947,6 +2974,12 @@ | ||
4451 | 844 | thd->init_for_queries(); | 3645 | thd->init_for_queries(); |
4452 | 845 | thd->temporary_tables = rli->save_temporary_tables; // restore temp tables | 3646 | thd->temporary_tables = rli->save_temporary_tables; // restore temp tables |
4453 | 846 | set_thd_in_use_temporary_tables(rli); // (re)set sql_thd in use for saved temp tables | 3647 | set_thd_in_use_temporary_tables(rli); // (re)set sql_thd in use for saved temp tables |
4454 | @@ -853,7 +3654,7 @@ | |||
4455 | 853 | pthread_mutex_lock(&LOCK_thread_count); | 3654 | pthread_mutex_lock(&LOCK_thread_count); |
4456 | 854 | threads.append(thd); | 3655 | threads.append(thd); |
4457 | 855 | pthread_mutex_unlock(&LOCK_thread_count); | 3656 | pthread_mutex_unlock(&LOCK_thread_count); |
4459 | 856 | @@ -3429,7 +3462,7 @@ | 3657 | @@ -3429,7 +3461,7 @@ |
4460 | 857 | If we get Load event, we need to pass a non-reusable buffer | 3658 | If we get Load event, we need to pass a non-reusable buffer |
4461 | 858 | to read_log_event, so we do a trick | 3659 | to read_log_event, so we do a trick |
4462 | 859 | */ | 3660 | */ |
4463 | @@ -862,7 +3663,7 @@ | |||
4464 | 862 | { | 3663 | { |
4465 | 863 | if (unlikely(!(tmp_buf=(char*)my_malloc(event_len+1,MYF(MY_WME))))) | 3664 | if (unlikely(!(tmp_buf=(char*)my_malloc(event_len+1,MYF(MY_WME))))) |
4466 | 864 | { | 3665 | { |
4468 | 865 | @@ -3629,6 +3662,7 @@ | 3666 | @@ -3629,6 +3661,7 @@ |
4469 | 866 | { | 3667 | { |
4470 | 867 | int error= 0; | 3668 | int error= 0; |
4471 | 868 | ulong inc_pos; | 3669 | ulong inc_pos; |
4472 | @@ -870,7 +3671,7 @@ | |||
4473 | 870 | Relay_log_info *rli= &mi->rli; | 3671 | Relay_log_info *rli= &mi->rli; |
4474 | 871 | pthread_mutex_t *log_lock= rli->relay_log.get_log_lock(); | 3672 | pthread_mutex_t *log_lock= rli->relay_log.get_log_lock(); |
4475 | 872 | DBUG_ENTER("queue_event"); | 3673 | DBUG_ENTER("queue_event"); |
4477 | 873 | @@ -3636,13 +3670,15 @@ | 3674 | @@ -3636,13 +3669,16 @@ |
4478 | 874 | LINT_INIT(inc_pos); | 3675 | LINT_INIT(inc_pos); |
4479 | 875 | 3676 | ||
4480 | 876 | if (mi->rli.relay_log.description_event_for_queue->binlog_version<4 && | 3677 | if (mi->rli.relay_log.description_event_for_queue->binlog_version<4 && |
4481 | @@ -884,7 +3685,8 @@ | |||
4482 | 884 | - switch (buf[EVENT_TYPE_OFFSET]) { | 3685 | - switch (buf[EVENT_TYPE_OFFSET]) { |
4483 | 885 | + new_pos= uint4korr(buf+LOG_POS_OFFSET); | 3686 | + new_pos= uint4korr(buf+LOG_POS_OFFSET); |
4484 | 886 | + | 3687 | + |
4486 | 887 | + switch ((uchar)buf[EVENT_TYPE_OFFSET]) { | 3688 | + switch ((uchar)buf[EVENT_TYPE_OFFSET]) |
4487 | 3689 | + { | ||
4488 | 888 | case STOP_EVENT: | 3690 | case STOP_EVENT: |
4489 | 889 | /* | 3691 | /* |
4490 | 890 | We needn't write this event to the relay log. Indeed, it just indicates a | 3692 | We needn't write this event to the relay log. Indeed, it just indicates a |
4491 | @@ -944,7 +3746,7 @@ | |||
4492 | 944 | if (!have_fd_event) | 3746 | if (!have_fd_event) |
4493 | 945 | { | 3747 | { |
4494 | 946 | - int type = bufptr[EVENT_TYPE_OFFSET]; | 3748 | - int type = bufptr[EVENT_TYPE_OFFSET]; |
4496 | 947 | + int type = (uchar)bufptr[EVENT_TYPE_OFFSET]; | 3749 | + int type= (uchar)bufptr[EVENT_TYPE_OFFSET]; |
4497 | 948 | if (type == FORMAT_DESCRIPTION_EVENT || type == START_EVENT_V3) | 3750 | if (type == FORMAT_DESCRIPTION_EVENT || type == START_EVENT_V3) |
4498 | 949 | have_fd_event= TRUE; | 3751 | have_fd_event= TRUE; |
4499 | 950 | else | 3752 | else |
4500 | @@ -1018,7 +3820,7 @@ | |||
4501 | 1018 | - } | 3820 | - } |
4502 | 1019 | + if (my_net_write(net, (uchar*) packet->ptr(), packet->length())) | 3821 | + if (my_net_write(net, (uchar*) packet->ptr(), packet->length())) |
4503 | 1020 | + { | 3822 | + { |
4505 | 1021 | + errmsg = "Failed on my_net_write()"; | 3823 | + errmsg= "Failed on my_net_write()"; |
4506 | 1022 | + my_errno= ER_UNKNOWN_ERROR; | 3824 | + my_errno= ER_UNKNOWN_ERROR; |
4507 | 1023 | + goto err; | 3825 | + goto err; |
4508 | 1024 | + } | 3826 | + } |
4509 | @@ -1049,14 +3851,14 @@ | |||
4510 | 1049 | + }); | 3851 | + }); |
4511 | 1050 | + | 3852 | + |
4512 | 1051 | + DBUG_PRINT("info", ("log event code %d", | 3853 | + DBUG_PRINT("info", ("log event code %d", |
4514 | 1052 | + (*packet)[LOG_EVENT_OFFSET+1] )); | 3854 | + (*packet)[LOG_EVENT_OFFSET+1])); |
4515 | 1053 | + if ((uchar)(*packet)[LOG_EVENT_OFFSET+1] == LOAD_EVENT) | 3855 | + if ((uchar)(*packet)[LOG_EVENT_OFFSET+1] == LOAD_EVENT) |
4516 | 1054 | + { | 3856 | + { |
4517 | 1055 | + if (send_file(thd)) | 3857 | + if (send_file(thd)) |
4518 | 1056 | + { | 3858 | + { |
4522 | 1057 | + errmsg = "failed in send_file()"; | 3859 | + errmsg= "failed in send_file()"; |
4523 | 1058 | + my_errno= ER_UNKNOWN_ERROR; | 3860 | + my_errno= ER_UNKNOWN_ERROR; |
4524 | 1059 | + goto err; | 3861 | + goto err; |
4525 | 1060 | + } | 3862 | + } |
4526 | 1061 | + } | 3863 | + } |
4527 | 1062 | } | 3864 | } |
4528 | @@ -1109,74 +3911,9 @@ | |||
4529 | 1109 | (uchar*) &opt_log_slave_updates); | 3911 | (uchar*) &opt_log_slave_updates); |
4530 | 1110 | +static sys_var_const | 3912 | +static sys_var_const |
4531 | 1111 | +sys_replicate_annotate_rows_events(&vars, | 3913 | +sys_replicate_annotate_rows_events(&vars, |
4535 | 1112 | + "replicate_annotate_rows_events", | 3914 | + "replicate_annotate_rows_events", |
4536 | 1113 | + OPT_GLOBAL, SHOW_MY_BOOL, | 3915 | + OPT_GLOBAL, SHOW_MY_BOOL, |
4537 | 1114 | + (uchar*) &opt_replicate_annotate_rows_events); | 3916 | + (uchar*) &opt_replicate_annotate_rows_events); |
4538 | 1115 | static sys_var_const sys_relay_log(&vars, "relay_log", | 3917 | static sys_var_const sys_relay_log(&vars, "relay_log", |
4539 | 1116 | OPT_GLOBAL, SHOW_CHAR_PTR, | 3918 | OPT_GLOBAL, SHOW_CHAR_PTR, |
4540 | 1117 | (uchar*) &opt_relay_logname); | 3919 | (uchar*) &opt_relay_logname); |
4541 | 1118 | --- /dev/null | ||
4542 | 1119 | +++ b/mysql-test/suite/rpl/t/percona_replicate_annotate_rows_events-master.opt | ||
4543 | 1120 | @@ -0,0 +1 @@ | ||
4544 | 1121 | +--binlog_annotate_rows_events --replicate_annotate_rows_events | ||
4545 | 1122 | --- /dev/null | ||
4546 | 1123 | +++ b/mysql-test/suite/rpl/t/percona_replicate_annotate_rows_events-slave.opt | ||
4547 | 1124 | @@ -0,0 +1 @@ | ||
4548 | 1125 | +--slave_net_timeout=1 --log_slave_updates=0 --binlog_annotate_rows_events --replicate_annotate_rows_events | ||
4549 | 1126 | --- /dev/null | ||
4550 | 1127 | +++ b/mysql-test/suite/rpl/t/percona_replicate_annotate_rows_events.test | ||
4551 | 1128 | @@ -0,0 +1,35 @@ | ||
4552 | 1129 | +######################################################################## | ||
4553 | 1130 | +# Bug #872754: Annotate rows events on slave doesnt' work without slave's binlog | ||
4554 | 1131 | +######################################################################## | ||
4555 | 1132 | + | ||
4556 | 1133 | +--source include/master-slave.inc | ||
4557 | 1134 | +--source include/have_binlog_format_row.inc | ||
4558 | 1135 | +--source include/have_debug.inc | ||
4559 | 1136 | + | ||
4560 | 1137 | +connection master; | ||
4561 | 1138 | +--disable_warnings | ||
4562 | 1139 | +DROP TABLE IF EXISTS t; | ||
4563 | 1140 | +--enable_warnings | ||
4564 | 1141 | + | ||
4565 | 1142 | +CREATE TABLE t (a INT); | ||
4566 | 1143 | +INSERT INTO t VALUES(1); | ||
4567 | 1144 | + | ||
4568 | 1145 | +--sleep 2 | ||
4569 | 1146 | + | ||
4570 | 1147 | +DROP TABLE t; | ||
4571 | 1148 | + | ||
4572 | 1149 | +# The following would hang with the bug not fixed | ||
4573 | 1150 | +--sync_slave_with_master | ||
4574 | 1151 | + | ||
4575 | 1152 | +connection master; | ||
4576 | 1153 | +--let $master_log_pos= query_get_value(SHOW MASTER STATUS, Position, 1) | ||
4577 | 1154 | +--eval select $master_log_pos | ||
4578 | 1155 | + | ||
4579 | 1156 | +connection slave; | ||
4580 | 1157 | +--let $read_master_log_pos= query_get_value(SHOW SLAVE STATUS, Read_Master_Log_Pos, 1) | ||
4581 | 1158 | +--eval select $master_log_pos = $read_master_log_pos | ||
4582 | 1159 | + | ||
4583 | 1160 | +--let $exec_master_log_pos= query_get_value(SHOW SLAVE STATUS, Exec_Master_Log_Pos, 1) | ||
4584 | 1161 | +--eval select $master_log_pos = $exec_master_log_pos | ||
4585 | 1162 | + | ||
4586 | 1163 | +--source include/rpl_end.inc | ||
4587 | 1164 | --- /dev/null | ||
4588 | 1165 | +++ b/mysql-test/suite/rpl/r/percona_replicate_annotate_rows_events.result | ||
4589 | 1166 | @@ -0,0 +1,16 @@ | ||
4590 | 1167 | +include/master-slave.inc | ||
4591 | 1168 | +[connection master] | ||
4592 | 1169 | +DROP TABLE IF EXISTS t; | ||
4593 | 1170 | +CREATE TABLE t (a INT); | ||
4594 | 1171 | +INSERT INTO t VALUES(1); | ||
4595 | 1172 | +DROP TABLE t; | ||
4596 | 1173 | +select 738; | ||
4597 | 1174 | +738 | ||
4598 | 1175 | +738 | ||
4599 | 1176 | +select 738 = 738; | ||
4600 | 1177 | +738 = 738 | ||
4601 | 1178 | +1 | ||
4602 | 1179 | +select 738 = 738; | ||
4603 | 1180 | +738 = 738 | ||
4604 | 1181 | +1 | ||
4605 | 1182 | +include/rpl_end.inc |
You propose to merge this to PS 5.1, while the prerequisite branch is proposed to be merged to rnt-5.1.