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