database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

24
mysql-test/suite/rpl/r/rpl_variables.result
View File

@ -1,9 +1,5 @@
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
include/master-slave.inc
[connection master]
==== Initialization ====
[on master]
SET @m_default_week_format= @@global.default_week_format;
@ -38,13 +34,8 @@ SET @@global.sql_mode = 'ALLOW_INVALID_DATES';
SET @@local.sql_mode = 'ANSI_QUOTES,ERROR_FOR_DIVISION_BY_ZERO,HIGH_NOT_PRECEDENCE';
SET @user_num = 10;
SET @user_text = 'Alunda';
[on master]
**** Resetting master and slave ****
include/stop_slave.inc
RESET SLAVE;
RESET MASTER;
include/start_slave.inc
[on slave]
SET @@global.init_slave = 'SELECT 1';
[on master]
CREATE TABLE tstmt (id INT AUTO_INCREMENT PRIMARY KEY,
@ -550,15 +541,7 @@ id truth num text
30 NULL 30 NULL
31 NULL NULL Bergsbrunna
32 NULL NULL Centrum
Comparing tables master:test.tstmt and master:test.tproc
Comparing tables master:test.tstmt and master:test.tfunc
Comparing tables master:test.tstmt and master:test.ttrig
Comparing tables master:test.tstmt and master:test.tprep
Comparing tables master:test.tstmt and slave:test.tstmt
Comparing tables master:test.tstmt and slave:test.tproc
Comparing tables master:test.tstmt and slave:test.tfunc
Comparing tables master:test.tstmt and slave:test.ttrig
Comparing tables master:test.tstmt and slave:test.tprep
include/diff_tables.inc [master:tstmt, master:tproc, master:tfunc, master:ttrig, master:tprep, slave:tstmt, slave:tproc, slave:tfunc, slave:ttrig, slave:tprep]
==== Clean up ====
[on master]
DROP PROCEDURE proc;
@ -582,3 +565,4 @@ SET @@global.relay_log_purge= @s_relay_log_purge;
SET @@global.slave_exec_mode= @s_slave_exec_mode;
SET @@global.sql_mode= @s_sql_mode;
SET @@global.sync_binlog= @s_sync_binlog;
include/rpl_end.inc