Merge lp:~laurynas-biveinis/percona-server/bug1280875-5.1 into lp:percona-server/5.1
- bug1280875-5.1
- Merge into 5.1
Proposed by
Laurynas Biveinis
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 620 |
Proposed branch: | lp:~laurynas-biveinis/percona-server/bug1280875-5.1 |
Merge into: | lp:percona-server/5.1 |
Diff against target: |
301 lines (+55/-55) 2 files modified
Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result (+39/-39) Percona-Server/mysql-test/suite/rpl/t/rpl_mdev382.test (+16/-16) |
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/bug1280875-5.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+228606@code.launchpad.net |
Commit message
Description of the change
Fix bug 1280875 (rpl.rpl_mdev382 is incompatible with
--lower-
taken from MariaDB
(https:/
http://
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result' |
2 | --- Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result 2012-10-05 07:20:04 +0000 |
3 | +++ Percona-Server/mysql-test/suite/rpl/r/rpl_mdev382.result 2014-07-29 07:37:08 +0000 |
4 | @@ -75,8 +75,8 @@ |
5 | master-bin.000001 # Xid # # COMMIT /* XID */ |
6 | *** Test correct USE statement in SHOW BINLOG EVENTS *** |
7 | set sql_mode = 'ANSI_QUOTES'; |
8 | -CREATE DATABASE "db1`; SELECT 'oops!'"; |
9 | -use "db1`; SELECT 'oops!'"; |
10 | +CREATE DATABASE "db1`; select 'oops!'"; |
11 | +use "db1`; select 'oops!'"; |
12 | CREATE TABLE t1 (a INT PRIMARY KEY) engine=MyISAM; |
13 | INSERT INTO t1 VALUES (1); |
14 | set sql_mode = ''; |
15 | @@ -84,29 +84,29 @@ |
16 | set sql_mode = 'ANSI_QUOTES'; |
17 | show binlog events from <binlog_start>; |
18 | Log_name Pos Event_type Server_id End_log_pos Info |
19 | -master-bin.000001 # Query # # CREATE DATABASE "db1`; SELECT 'oops!'" |
20 | -master-bin.000001 # Query # # use "db1`; SELECT 'oops!'"; CREATE TABLE t1 (a INT PRIMARY KEY) engine=MyISAM |
21 | -master-bin.000001 # Query # # use "db1`; SELECT 'oops!'"; INSERT INTO t1 VALUES (1) |
22 | -master-bin.000001 # Query # # use "db1`; SELECT 'oops!'"; INSERT INTO t1 VALUES (2) |
23 | +master-bin.000001 # Query # # CREATE DATABASE "db1`; select 'oops!'" |
24 | +master-bin.000001 # Query # # use "db1`; select 'oops!'"; CREATE TABLE t1 (a INT PRIMARY KEY) engine=MyISAM |
25 | +master-bin.000001 # Query # # use "db1`; select 'oops!'"; INSERT INTO t1 VALUES (1) |
26 | +master-bin.000001 # Query # # use "db1`; select 'oops!'"; INSERT INTO t1 VALUES (2) |
27 | set sql_mode = ''; |
28 | set sql_quote_show_create = 0; |
29 | show binlog events from <binlog_start>; |
30 | Log_name Pos Event_type Server_id End_log_pos Info |
31 | -master-bin.000001 # Query # # CREATE DATABASE "db1`; SELECT 'oops!'" |
32 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; CREATE TABLE t1 (a INT PRIMARY KEY) engine=MyISAM |
33 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; INSERT INTO t1 VALUES (1) |
34 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; INSERT INTO t1 VALUES (2) |
35 | +master-bin.000001 # Query # # CREATE DATABASE "db1`; select 'oops!'" |
36 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; CREATE TABLE t1 (a INT PRIMARY KEY) engine=MyISAM |
37 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; INSERT INTO t1 VALUES (1) |
38 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; INSERT INTO t1 VALUES (2) |
39 | set sql_quote_show_create = 1; |
40 | show binlog events from <binlog_start>; |
41 | Log_name Pos Event_type Server_id End_log_pos Info |
42 | -master-bin.000001 # Query # # CREATE DATABASE "db1`; SELECT 'oops!'" |
43 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; CREATE TABLE t1 (a INT PRIMARY KEY) engine=MyISAM |
44 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; INSERT INTO t1 VALUES (1) |
45 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; INSERT INTO t1 VALUES (2) |
46 | +master-bin.000001 # Query # # CREATE DATABASE "db1`; select 'oops!'" |
47 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; CREATE TABLE t1 (a INT PRIMARY KEY) engine=MyISAM |
48 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; INSERT INTO t1 VALUES (1) |
49 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; INSERT INTO t1 VALUES (2) |
50 | DROP TABLE t1; |
51 | use test; |
52 | ***Test LOAD DATA INFILE with various identifiers that need correct quoting *** |
53 | -use `db1``; SELECT 'oops!'`; |
54 | +use `db1``; select 'oops!'`; |
55 | set timestamp=1000000000; |
56 | CREATE TABLE `t``1` (`a``1` VARCHAR(4) PRIMARY KEY, `b``2` VARCHAR(3), |
57 | `c``3` VARCHAR(7)); |
58 | @@ -120,27 +120,27 @@ |
59 | truncate `t``1`; |
60 | use test; |
61 | LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/f''le.txt' |
62 | - INTO TABLE `db1``; SELECT 'oops!'`.`t``1` |
63 | + INTO TABLE `db1``; select 'oops!'`.`t``1` |
64 | FIELDS TERMINATED BY ',' ESCAPED BY '\\' ENCLOSED BY '''' |
65 | LINES TERMINATED BY '\n' |
66 | (`a``1`, `b``2`) SET `c``3` = concat('|', "b""a'z", "!"); |
67 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1`; |
68 | +SELECT * FROM `db1``; select 'oops!'`.`t``1`; |
69 | a`1 b`2 c`3 |
70 | fo\o bar |b"a'z! |
71 | show binlog events from <binlog_start>; |
72 | Log_name Pos Event_type Server_id End_log_pos Info |
73 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; CREATE TABLE `t``1` (`a``1` VARCHAR(4) PRIMARY KEY, `b``2` VARCHAR(3), |
74 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; CREATE TABLE `t``1` (`a``1` VARCHAR(4) PRIMARY KEY, `b``2` VARCHAR(3), |
75 | `c``3` VARCHAR(7)) |
76 | master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=# |
77 | -master-bin.000001 # Execute_load_query # # use `db1``; SELECT 'oops!'`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/f\'le.txt' INTO TABLE `t``1` FIELDS TERMINATED BY ',' ENCLOSED BY '\'' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a``1`, @`b```) SET `b``2`=(@`b```), `c``3`=concat('|','b"a\'z','!') ;file_id=# |
78 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; truncate `t``1` |
79 | +master-bin.000001 # Execute_load_query # # use `db1``; select 'oops!'`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/f\'le.txt' INTO TABLE `t``1` FIELDS TERMINATED BY ',' ENCLOSED BY '\'' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a``1`, @`b```) SET `b``2`=(@`b```), `c``3`=concat('|','b"a\'z','!') ;file_id=# |
80 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; truncate `t``1` |
81 | master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=# |
82 | -master-bin.000001 # Execute_load_query # # use `test`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/f\'le.txt' INTO TABLE `db1``; SELECT 'oops!'`.`t``1` FIELDS TERMINATED BY ',' ENCLOSED BY '\'' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a``1`, `b``2`) SET `c``3`=concat('|','b"a\'z','!') ;file_id=# |
83 | +master-bin.000001 # Execute_load_query # # use `test`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/f\'le.txt' INTO TABLE `db1``; select 'oops!'`.`t``1` FIELDS TERMINATED BY ',' ENCLOSED BY '\'' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a``1`, `b``2`) SET `c``3`=concat('|','b"a\'z','!') ;file_id=# |
84 | /*!40019 SET @@session.max_insert_delayed_threads=0*/; |
85 | /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; |
86 | DELIMITER /*!*/; |
87 | ROLLBACK/*!*/; |
88 | -use `db1``; SELECT 'oops!'`/*!*/; |
89 | +use `db1``; select 'oops!'`/*!*/; |
90 | SET TIMESTAMP=1000000000/*!*/; |
91 | SET @@session.pseudo_thread_id=999999999/*!*/; |
92 | SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; |
93 | @@ -161,16 +161,16 @@ |
94 | /*!*/; |
95 | use `test`/*!*/; |
96 | SET TIMESTAMP=1000000000/*!*/; |
97 | -LOAD DATA LOCAL INFILE '<name>' INTO TABLE `db1``; SELECT 'oops!'`.`t``1` FIELDS TERMINATED BY ',' ENCLOSED BY '\'' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a``1`, `b``2`) SET `c``3`=concat('|','b"a\'z','!') |
98 | +LOAD DATA LOCAL INFILE '<name>' INTO TABLE `db1``; select 'oops!'`.`t``1` FIELDS TERMINATED BY ',' ENCLOSED BY '\'' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a``1`, `b``2`) SET `c``3`=concat('|','b"a\'z','!') |
99 | /*!*/; |
100 | DELIMITER ; |
101 | # End of log file |
102 | ROLLBACK /* added by mysqlbinlog */; |
103 | /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; |
104 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1`; |
105 | +SELECT * FROM `db1``; select 'oops!'`.`t``1`; |
106 | a`1 b`2 c`3 |
107 | fo\o bar |b"a'z! |
108 | -DROP TABLE `db1``; SELECT 'oops!'`.`t``1`; |
109 | +DROP TABLE `db1``; select 'oops!'`.`t``1`; |
110 | drop table t1,t2; |
111 | *** Test truncation of long SET expression in LOAD DATA *** |
112 | CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(1000)); |
113 | @@ -191,7 +191,7 @@ |
114 | 2 A| 123456789A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789I123456789J123456789K123456789L123456789M123456789N123456789O123456789P123456789Q123456789R123456789123456789T123456789U123456789V123456789W123456789X123456789Y123456789Z123456789|A |
115 | DROP TABLE t1; |
116 | *** Test user variables whose names require correct quoting *** |
117 | -use `db1``; SELECT 'oops!'`; |
118 | +use `db1``; select 'oops!'`; |
119 | CREATE TABLE t1 (a1 BIGINT PRIMARY KEY, a2 BIGINT, a3 BIGINT, a4 BIGINT UNSIGNED, b DOUBLE, c DECIMAL(65,10), d VARCHAR(100)); |
120 | INSERT INTO t1 VALUES (-9223372036854775808,42,9223372036854775807,18446744073709551615,-1234560123456789e110, -1234501234567890123456789012345678901234567890123456789.0123456789, REPEAT("x", 100)); |
121 | SELECT @`a``1`:=a1, @`a``2`:=a2, @`a``3`:=a3, @`a``4`:=a4, @`b```:=b, @```c`:=c, @```d```:=d FROM t1; |
122 | @@ -200,8 +200,8 @@ |
123 | INSERT INTO t1 VALUES (@`a``1`+1, @`a``2`*100, @`a``3`-1, @`a``4`-1, @`b```/2, @```c`, substr(@```d```, 2, 98)); |
124 | show binlog events from <binlog_start>; |
125 | Log_name Pos Event_type Server_id End_log_pos Info |
126 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; CREATE TABLE t1 (a1 BIGINT PRIMARY KEY, a2 BIGINT, a3 BIGINT, a4 BIGINT UNSIGNED, b DOUBLE, c DECIMAL(65,10), d VARCHAR(100)) |
127 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; INSERT INTO t1 VALUES (-9223372036854775808,42,9223372036854775807,18446744073709551615,-1234560123456789e110, -1234501234567890123456789012345678901234567890123456789.0123456789, REPEAT("x", 100)) |
128 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; CREATE TABLE t1 (a1 BIGINT PRIMARY KEY, a2 BIGINT, a3 BIGINT, a4 BIGINT UNSIGNED, b DOUBLE, c DECIMAL(65,10), d VARCHAR(100)) |
129 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; INSERT INTO t1 VALUES (-9223372036854775808,42,9223372036854775807,18446744073709551615,-1234560123456789e110, -1234501234567890123456789012345678901234567890123456789.0123456789, REPEAT("x", 100)) |
130 | master-bin.000001 # User var # # @`a``1`=-9223372036854775808 |
131 | master-bin.000001 # User var # # @`a``2`=42 |
132 | master-bin.000001 # User var # # @`a``3`=9223372036854775807 |
133 | @@ -209,12 +209,12 @@ |
134 | master-bin.000001 # User var # # @`b```=-1.2345601234568e+125 |
135 | master-bin.000001 # User var # # @```c`=-1234501234567890123456789012345678901234567890123456789.0123456789 |
136 | master-bin.000001 # User var # # @```d```=_latin1 0x78787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878787878 COLLATE latin1_swedish_ci |
137 | -master-bin.000001 # Query # # use `db1``; SELECT 'oops!'`; INSERT INTO t1 VALUES (@`a``1`+1, @`a``2`*100, @`a``3`-1, @`a``4`-1, @`b```/2, @```c`, substr(@```d```, 2, 98)) |
138 | +master-bin.000001 # Query # # use `db1``; select 'oops!'`; INSERT INTO t1 VALUES (@`a``1`+1, @`a``2`*100, @`a``3`-1, @`a``4`-1, @`b```/2, @```c`, substr(@```d```, 2, 98)) |
139 | /*!40019 SET @@session.max_insert_delayed_threads=0*/; |
140 | /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; |
141 | DELIMITER /*!*/; |
142 | ROLLBACK/*!*/; |
143 | -use `db1``; SELECT 'oops!'`/*!*/; |
144 | +use `db1``; select 'oops!'`/*!*/; |
145 | SET TIMESTAMP=1000000000/*!*/; |
146 | SET @@session.pseudo_thread_id=999999999/*!*/; |
147 | SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/; |
148 | @@ -243,33 +243,33 @@ |
149 | # End of log file |
150 | ROLLBACK /* added by mysqlbinlog */; |
151 | /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; |
152 | -SELECT * FROM `db1``; SELECT 'oops!'`.t1 ORDER BY a1; |
153 | +SELECT * FROM `db1``; select 'oops!'`.t1 ORDER BY a1; |
154 | a1 a2 a3 a4 b c d |
155 | -9223372036854775808 42 9223372036854775807 18446744073709551615 -1.23456012345679e+125 -1234501234567890123456789012345678901234567890123456789.0123456789 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
156 | -9223372036854775807 4200 9223372036854775806 0 -6.17280061728394e+124 -1234501234567890123456789012345678901234567890123456789.0123456789 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
157 | DROP TABLE t1; |
158 | *** Test correct quoting of DELETE FROM statement binlogged for HEAP table that is emptied due to server restart |
159 | include/stop_slave.inc |
160 | -CREATE TABLE `db1``; SELECT 'oops!'`.`t``1` (`a``` INT PRIMARY KEY) ENGINE=heap; |
161 | -INSERT INTO `db1``; SELECT 'oops!'`.`t``1` VALUES (1), (2), (5); |
162 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1` ORDER BY 1; |
163 | +CREATE TABLE `db1``; select 'oops!'`.`t``1` (`a``` INT PRIMARY KEY) ENGINE=heap; |
164 | +INSERT INTO `db1``; select 'oops!'`.`t``1` VALUES (1), (2), (5); |
165 | +SELECT * FROM `db1``; select 'oops!'`.`t``1` ORDER BY 1; |
166 | a` |
167 | 1 |
168 | 2 |
169 | 5 |
170 | set timestamp=1000000000; |
171 | # The table should be empty on the master. |
172 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1`; |
173 | +SELECT * FROM `db1``; select 'oops!'`.`t``1`; |
174 | a` |
175 | # The DELETE statement should be correctly quoted |
176 | show binlog events in 'master-bin.000002' from <binlog_start>; |
177 | Log_name Pos Event_type Server_id End_log_pos Info |
178 | -master-bin.000002 # Query # # use `test`; DELETE FROM `db1``; SELECT 'oops!'`.`t``1` |
179 | +master-bin.000002 # Query # # use `test`; DELETE FROM `db1``; select 'oops!'`.`t``1` |
180 | include/start_slave.inc |
181 | # The table should be empty on the slave also. |
182 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1`; |
183 | +SELECT * FROM `db1``; select 'oops!'`.`t``1`; |
184 | a` |
185 | -DROP TABLE `db1``; SELECT 'oops!'`.`t``1`; |
186 | +DROP TABLE `db1``; select 'oops!'`.`t``1`; |
187 | use test; |
188 | -DROP DATABASE `db1``; SELECT 'oops!'`; |
189 | +DROP DATABASE `db1``; select 'oops!'`; |
190 | include/rpl_end.inc |
191 | |
192 | === modified file 'Percona-Server/mysql-test/suite/rpl/t/rpl_mdev382.test' |
193 | --- Percona-Server/mysql-test/suite/rpl/t/rpl_mdev382.test 2012-10-05 07:20:04 +0000 |
194 | +++ Percona-Server/mysql-test/suite/rpl/t/rpl_mdev382.test 2014-07-29 07:37:08 +0000 |
195 | @@ -65,8 +65,8 @@ |
196 | connection master; |
197 | let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1); |
198 | set sql_mode = 'ANSI_QUOTES'; |
199 | -CREATE DATABASE "db1`; SELECT 'oops!'"; |
200 | -use "db1`; SELECT 'oops!'"; |
201 | +CREATE DATABASE "db1`; select 'oops!'"; |
202 | +use "db1`; select 'oops!'"; |
203 | CREATE TABLE t1 (a INT PRIMARY KEY) engine=MyISAM; |
204 | INSERT INTO t1 VALUES (1); |
205 | set sql_mode = ''; |
206 | @@ -90,7 +90,7 @@ |
207 | EOF |
208 | --exec chmod go+r "$load_file" |
209 | |
210 | -use `db1``; SELECT 'oops!'`; |
211 | +use `db1``; select 'oops!'`; |
212 | let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1); |
213 | set timestamp=1000000000; |
214 | CREATE TABLE `t``1` (`a``1` VARCHAR(4) PRIMARY KEY, `b``2` VARCHAR(3), |
215 | @@ -107,11 +107,11 @@ |
216 | use test; |
217 | --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR |
218 | eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/f''le.txt' |
219 | - INTO TABLE `db1``; SELECT 'oops!'`.`t``1` |
220 | + INTO TABLE `db1``; select 'oops!'`.`t``1` |
221 | FIELDS TERMINATED BY ',' ESCAPED BY '\\\\' ENCLOSED BY '''' |
222 | LINES TERMINATED BY '\\n' |
223 | (`a``1`, `b``2`) SET `c``3` = concat('|', "b""a'z", "!"); |
224 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1`; |
225 | +SELECT * FROM `db1``; select 'oops!'`.`t``1`; |
226 | let $pos2= query_get_value(SHOW MASTER STATUS, Position, 1); |
227 | |
228 | --source include/show_binlog_events.inc |
229 | @@ -121,10 +121,10 @@ |
230 | |
231 | sync_slave_with_master; |
232 | connection slave; |
233 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1`; |
234 | +SELECT * FROM `db1``; select 'oops!'`.`t``1`; |
235 | connection master; |
236 | |
237 | -DROP TABLE `db1``; SELECT 'oops!'`.`t``1`; |
238 | +DROP TABLE `db1``; select 'oops!'`.`t``1`; |
239 | --remove_file $load_file |
240 | |
241 | connection master; |
242 | @@ -161,7 +161,7 @@ |
243 | |
244 | |
245 | --echo *** Test user variables whose names require correct quoting *** |
246 | -use `db1``; SELECT 'oops!'`; |
247 | +use `db1``; select 'oops!'`; |
248 | let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1); |
249 | CREATE TABLE t1 (a1 BIGINT PRIMARY KEY, a2 BIGINT, a3 BIGINT, a4 BIGINT UNSIGNED, b DOUBLE, c DECIMAL(65,10), d VARCHAR(100)); |
250 | INSERT INTO t1 VALUES (-9223372036854775808,42,9223372036854775807,18446744073709551615,-1234560123456789e110, -1234501234567890123456789012345678901234567890123456789.0123456789, REPEAT("x", 100)); |
251 | @@ -175,7 +175,7 @@ |
252 | |
253 | sync_slave_with_master; |
254 | connection slave; |
255 | -SELECT * FROM `db1``; SELECT 'oops!'`.t1 ORDER BY a1; |
256 | +SELECT * FROM `db1``; select 'oops!'`.t1 ORDER BY a1; |
257 | |
258 | connection master; |
259 | DROP TABLE t1; |
260 | @@ -189,9 +189,9 @@ |
261 | --source include/stop_slave.inc |
262 | |
263 | connection master; |
264 | -CREATE TABLE `db1``; SELECT 'oops!'`.`t``1` (`a``` INT PRIMARY KEY) ENGINE=heap; |
265 | -INSERT INTO `db1``; SELECT 'oops!'`.`t``1` VALUES (1), (2), (5); |
266 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1` ORDER BY 1; |
267 | +CREATE TABLE `db1``; select 'oops!'`.`t``1` (`a``` INT PRIMARY KEY) ENGINE=heap; |
268 | +INSERT INTO `db1``; select 'oops!'`.`t``1` VALUES (1), (2), (5); |
269 | +SELECT * FROM `db1``; select 'oops!'`.`t``1` ORDER BY 1; |
270 | |
271 | # Restart the master mysqld. |
272 | # This will cause an implicit truncation of the memory-based table, which will |
273 | @@ -222,7 +222,7 @@ |
274 | --echo # The table should be empty on the master. |
275 | let $binlog_file= master-bin.000002; |
276 | let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1); |
277 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1`; |
278 | +SELECT * FROM `db1``; select 'oops!'`.`t``1`; |
279 | |
280 | --echo # The DELETE statement should be correctly quoted |
281 | --source include/show_binlog_events.inc |
282 | @@ -234,16 +234,16 @@ |
283 | sync_slave_with_master; |
284 | connection slave; |
285 | --echo # The table should be empty on the slave also. |
286 | -SELECT * FROM `db1``; SELECT 'oops!'`.`t``1`; |
287 | +SELECT * FROM `db1``; select 'oops!'`.`t``1`; |
288 | |
289 | connection master; |
290 | -DROP TABLE `db1``; SELECT 'oops!'`.`t``1`; |
291 | +DROP TABLE `db1``; select 'oops!'`.`t``1`; |
292 | sync_slave_with_master; |
293 | |
294 | |
295 | connection master; |
296 | use test; |
297 | -DROP DATABASE `db1``; SELECT 'oops!'`; |
298 | +DROP DATABASE `db1``; select 'oops!'`; |
299 | |
300 | |
301 | --source include/rpl_end.inc |