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

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

Browse Source
This commit is contained in:
Sven Sandberg
2010-12-19 18:15:12 +01:00
parent a3cc81fa70 8b27f9a05e
commit 1bd213aec3
831 changed files with 7924 additions and 6322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mysql-test/suite/rpl/t/rpl_variables.test
View File

@@ -109,14 +109,11 @@ SET @user_text = 'Alunda';
# Stop slave so that we get a fresh sql thread, reading the slave's
# global values of variables into its local copies.
--echo [on master]
connection master;
source include/reset_master_and_slave.inc;
--source include/stop_slave.inc
--source include/start_slave.inc
# We would have wanted to set this together with the other variables
# above, but can't because it affects how the slave works.
--echo [on slave]
connection slave;
SET @@global.init_slave = 'SELECT 1';
@@ -674,35 +671,19 @@ EXECUTE p49; EXECUTE p50; EXECUTE p51; EXECUTE p52; EXECUTE p53; EXECUTE p54;
EXECUTE p55; EXECUTE p56; EXECUTE p57; EXECUTE p58; EXECUTE p59; EXECUTE p60;
EXECUTE p61; EXECUTE p62; EXECUTE p63; EXECUTE p64;
--sync_slave_with_master
--connection master
--echo ==== Results ====
# Show the result in table test.tstmt on master...
SELECT * FROM tstmt ORDER BY id;
let $diff_table_1=master:test.tstmt;
# ... then compare test.tstmt on master to the other tables on master...
let $diff_table_2=master:test.tproc;
source include/diff_tables.inc;
let $diff_table_2=master:test.tfunc;
source include/diff_tables.inc;
let $diff_table_2=master:test.ttrig;
source include/diff_tables.inc;
let $diff_table_2=master:test.tprep;
source include/diff_tables.inc;
--sync_slave_with_master
# ... and to all tables on slave.
connection master;
sync_slave_with_master;
let $diff_table_2=slave:test.tstmt;
source include/diff_tables.inc;
let $diff_table_2=slave:test.tproc;
source include/diff_tables.inc;
let $diff_table_2=slave:test.tfunc;
source include/diff_tables.inc;
let $diff_table_2=slave:test.ttrig;
source include/diff_tables.inc;
let $diff_table_2=slave:test.tprep;
# ... then compare test.tstmt on master to the other tables on master and slave.
let $diff_tables= master:tstmt, master:tproc, master:tfunc, master:ttrig, master:tprep, slave:tstmt, slave:tproc, slave:tfunc, slave:ttrig, slave:tprep;
source include/diff_tables.inc;
@@ -737,3 +718,4 @@ SET @@global.sync_binlog= @s_sync_binlog;
connection master;
sync_slave_with_master;
--source include/rpl_end.inc