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