mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
This patch includes modification to the rpl_events test to limit
the SELECT in the test to only the expected rows. This helps eliminate the possibility of spurious rows causing the test to fail. mysql-test/r/rpl_events.result: This patch modifies the test results to match the new SELECT for test results.
This commit is contained in:
@ -34,7 +34,7 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name
|
|||||||
--echo "in the master"
|
--echo "in the master"
|
||||||
--enable_info
|
--enable_info
|
||||||
--replace_column 3 TIMESTAMP
|
--replace_column 3 TIMESTAMP
|
||||||
SELECT * FROM t1;
|
SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;
|
||||||
--disable_info
|
--disable_info
|
||||||
|
|
||||||
sync_slave_with_master;
|
sync_slave_with_master;
|
||||||
@ -42,7 +42,7 @@ sync_slave_with_master;
|
|||||||
--echo "in the slave"
|
--echo "in the slave"
|
||||||
--enable_info
|
--enable_info
|
||||||
--replace_column 3 TIMESTAMP
|
--replace_column 3 TIMESTAMP
|
||||||
SELECT * FROM t1;
|
SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;
|
||||||
--disable_info
|
--disable_info
|
||||||
|
|
||||||
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';
|
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';
|
||||||
|
@ -21,13 +21,13 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name
|
|||||||
db name status originator
|
db name status originator
|
||||||
test justonce ENABLED 1
|
test justonce ENABLED 1
|
||||||
"in the master"
|
"in the master"
|
||||||
SELECT * FROM t1;
|
SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;
|
||||||
id c ts
|
id c ts
|
||||||
1 manually TIMESTAMP
|
1 manually TIMESTAMP
|
||||||
2 from justonce TIMESTAMP
|
2 from justonce TIMESTAMP
|
||||||
affected rows: 2
|
affected rows: 2
|
||||||
"in the slave"
|
"in the slave"
|
||||||
SELECT * FROM t1;
|
SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;
|
||||||
id c ts
|
id c ts
|
||||||
1 manually TIMESTAMP
|
1 manually TIMESTAMP
|
||||||
2 from justonce TIMESTAMP
|
2 from justonce TIMESTAMP
|
||||||
@ -98,13 +98,13 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name
|
|||||||
db name status originator
|
db name status originator
|
||||||
test justonce ENABLED 1
|
test justonce ENABLED 1
|
||||||
"in the master"
|
"in the master"
|
||||||
SELECT * FROM t1;
|
SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;
|
||||||
id c ts
|
id c ts
|
||||||
1 manually TIMESTAMP
|
1 manually TIMESTAMP
|
||||||
2 from justonce TIMESTAMP
|
2 from justonce TIMESTAMP
|
||||||
affected rows: 2
|
affected rows: 2
|
||||||
"in the slave"
|
"in the slave"
|
||||||
SELECT * FROM t1;
|
SELECT * FROM t1 WHERE c = 'from justonce' OR c = 'manually' ORDER BY id;
|
||||||
id c ts
|
id c ts
|
||||||
1 manually TIMESTAMP
|
1 manually TIMESTAMP
|
||||||
2 from justonce TIMESTAMP
|
2 from justonce TIMESTAMP
|
||||||
|
Reference in New Issue
Block a user