database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam

Browse Source 
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/BARE/mysql-5.1-bugteam
This commit is contained in:
unknown
2008-05-05 13:28:07 +03:00
parent ae7c0deaf9 8cc540767d
commit 229b3db400
2 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/include/rpl_events.inc
View File

@ -41,18 +41,17 @@ let $wait_condition=
# check that table t1 contains something # check that table t1 contains something
--echo "Checking event data on the master" --echo "Checking event data on the master"
--enable_info let $events_done=`SELECT count(*) FROM t1 id`;
--replace_column 3 TIMESTAMP --disable_query_log
SELECT * FROM t1 ORDER BY id; eval SELECT $events_done > 0 as ONE;
--disable_info --enable_query_log
sync_slave_with_master; sync_slave_with_master;
--echo "Checking event data on the slave" --echo "Checking event data on the slave"
--enable_info --disable_query_log
--replace_column 3 TIMESTAMP eval SELECT count(*) - $events_done as ZERO FROM t1 id;
SELECT * FROM t1 ORDER BY id; --enable_query_log
--disable_info
--echo "Checking event is inactive on slave" --echo "Checking event is inactive on slave"
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';

28
mysql-test/suite/rpl/r/rpl_events.result
View File

@ -23,17 +23,11 @@ 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
"Checking event data on the master" "Checking event data on the master"
SELECT * FROM t1 ORDER BY id; ONE
id c ts 1
1 manually TIMESTAMP
2 from justonce TIMESTAMP
affected rows: 2
"Checking event data on the slave" "Checking event data on the slave"
SELECT * FROM t1 ORDER BY id; ZERO
id c ts 0
1 manually TIMESTAMP
2 from justonce TIMESTAMP
affected rows: 2
"Checking event is inactive on slave" "Checking event is inactive on slave"
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';
db name status originator db name status originator
@ -118,17 +112,11 @@ 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
"Checking event data on the master" "Checking event data on the master"
SELECT * FROM t1 ORDER BY id; ONE
id c ts 1
1 manually TIMESTAMP
2 from justonce TIMESTAMP
affected rows: 2
"Checking event data on the slave" "Checking event data on the slave"
SELECT * FROM t1 ORDER BY id; ZERO
id c ts 0
1 manually TIMESTAMP
2 from justonce TIMESTAMP
affected rows: 2
"Checking event is inactive on slave" "Checking event is inactive on slave"
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';
db name status originator db name status originator