Commit 905613f8 authored by Monty's avatar Monty

Fixed wrong tests found by buildbot

parent 19d99faf
...@@ -27,7 +27,7 @@ ROLLBACK/*!*/; ...@@ -27,7 +27,7 @@ ROLLBACK/*!*/;
/*!100001 SET @@session.server_id=1*//*!*/; /*!100001 SET @@session.server_id=1*//*!*/;
/*!100001 SET @@session.gtid_seq_no=1*//*!*/; /*!100001 SET @@session.gtid_seq_no=1*//*!*/;
# at 352 # at 352
#<date> server id 1 end_log_pos 532 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 532 Query thread_id=4 exec_time=x error_code=0
use `test`/*!*/; use `test`/*!*/;
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
SET @@session.pseudo_thread_id=4/*!*/; SET @@session.pseudo_thread_id=4/*!*/;
...@@ -44,7 +44,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f ...@@ -44,7 +44,7 @@ CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f
#<date> server id 1 end_log_pos 570 GTID 0-1-2 ddl #<date> server id 1 end_log_pos 570 GTID 0-1-2 ddl
/*!100001 SET @@session.gtid_seq_no=2*//*!*/; /*!100001 SET @@session.gtid_seq_no=2*//*!*/;
# at 570 # at 570
#<date> server id 1 end_log_pos 743 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 743 Query thread_id=4 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1)) CREATE TABLE t2 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 INT, f4 INT, f5 MEDIUMINT, f6 INT, f7 INT, f8 char(1))
/*!*/; /*!*/;
...@@ -69,7 +69,7 @@ BEGIN ...@@ -69,7 +69,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# at 898 # at 898
#<date> server id 1 end_log_pos 967 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 967 Query thread_id=4 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
...@@ -94,7 +94,7 @@ BEGIN ...@@ -94,7 +94,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */ ### @9=NULL /* STRING(1) meta=65025 nullable=1 is_null=1 */
# at 1121 # at 1121
#<date> server id 1 end_log_pos 1190 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 1190 Query thread_id=4 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
...@@ -119,7 +119,7 @@ BEGIN ...@@ -119,7 +119,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# at 1343 # at 1343
#<date> server id 1 end_log_pos 1412 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 1412 Query thread_id=4 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
...@@ -144,7 +144,7 @@ BEGIN ...@@ -144,7 +144,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# at 1568 # at 1568
#<date> server id 1 end_log_pos 1637 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 1637 Query thread_id=4 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
...@@ -202,7 +202,7 @@ BEGIN ...@@ -202,7 +202,7 @@ BEGIN
### @8=7 /* INT meta=0 nullable=1 is_null=0 */ ### @8=7 /* INT meta=0 nullable=1 is_null=0 */
### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */ ### @9='A' /* STRING(1) meta=65025 nullable=1 is_null=0 */
# at 1890 # at 1890
#<date> server id 1 end_log_pos 1959 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 1959 Query thread_id=4 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
...@@ -234,7 +234,7 @@ BEGIN ...@@ -234,7 +234,7 @@ BEGIN
### SET ### SET
### @5=5 /* INT meta=0 nullable=1 is_null=0 */ ### @5=5 /* INT meta=0 nullable=1 is_null=0 */
# at 2119 # at 2119
#<date> server id 1 end_log_pos 2188 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 2188 Query thread_id=4 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
...@@ -260,7 +260,7 @@ BEGIN ...@@ -260,7 +260,7 @@ BEGIN
### WHERE ### WHERE
### @1=13 /* INT meta=0 nullable=0 is_null=0 */ ### @1=13 /* INT meta=0 nullable=0 is_null=0 */
# at 2328 # at 2328
#<date> server id 1 end_log_pos 2397 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 2397 Query thread_id=4 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
...@@ -286,7 +286,7 @@ BEGIN ...@@ -286,7 +286,7 @@ BEGIN
### WHERE ### WHERE
### @1=13 /* INT meta=0 nullable=0 is_null=0 */ ### @1=13 /* INT meta=0 nullable=0 is_null=0 */
# at 2537 # at 2537
#<date> server id 1 end_log_pos 2606 Query thread_id=4 exec_time=0 error_code=0 #<date> server id 1 end_log_pos 2606 Query thread_id=4 exec_time=x error_code=0
SET TIMESTAMP=X/*!*/; SET TIMESTAMP=X/*!*/;
COMMIT COMMIT
/*!*/; /*!*/;
......
...@@ -13,7 +13,6 @@ SET DEBUG_SYNC= 'now WAIT_FOR oppp'; ...@@ -13,7 +13,6 @@ SET DEBUG_SYNC= 'now WAIT_FOR oppp';
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
CREATE ALGORITHM = TEMPTABLE VIEW v1 AS SELECT 2; CREATE ALGORITHM = TEMPTABLE VIEW v1 AS SELECT 2;
SET DEBUG_SYNC= 'now SIGNAL created'; SET DEBUG_SYNC= 'now SIGNAL created';
SET DEBUG_SYNC= 'RESET';
3 3
3 3
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
......
...@@ -27,7 +27,7 @@ DELETE FROM t2; ...@@ -27,7 +27,7 @@ DELETE FROM t2;
FLUSH BINARY LOGS; FLUSH BINARY LOGS;
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ --replace_regex /\d{6} *\d*:\d\d:\d\d/<date>/ /Start:.*at startup/Start: xxx/ /SET TIMESTAMP=\d*/SET TIMESTAMP=X/ /exec_time=\d*/exec_time=x/
--exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog --exec $MYSQL_BINLOG --verbose --verbose --base64-output=DECODE-ROWS $datadir/$binlog
DROP TABLE t1,t2; DROP TABLE t1,t2;
...@@ -26,7 +26,6 @@ SET DEBUG_SYNC= 'now WAIT_FOR oppp'; ...@@ -26,7 +26,6 @@ SET DEBUG_SYNC= 'now WAIT_FOR oppp';
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
CREATE ALGORITHM = TEMPTABLE VIEW v1 AS SELECT 2; CREATE ALGORITHM = TEMPTABLE VIEW v1 AS SELECT 2;
SET DEBUG_SYNC= 'now SIGNAL created'; SET DEBUG_SYNC= 'now SIGNAL created';
SET DEBUG_SYNC= 'RESET';
--connection con1 --connection con1
--reap --reap
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment