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

15
mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.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]
---Setup Section --
set timestamp=1000000000;
@ -83,9 +79,11 @@ DROP TABLE t1;
DROP TABLE t2;
DROP TABLE t3;
stop slave;
include/wait_for_slave_to_stop.inc
reset master;
reset slave;
start slave;
include/wait_for_slave_to_start.inc
--- Test 1 Load from Dump binlog file --
@ -209,9 +207,11 @@ DROP TABLE t1;
DROP TABLE t2;
DROP TABLE t3;
stop slave;
include/wait_for_slave_to_stop.inc
reset master;
reset slave;
start slave;
include/wait_for_slave_to_start.inc
SELECT COUNT(*) from t1;
COUNT(*)
352
@ -337,9 +337,11 @@ ROLLBACK /* added by mysqlbinlog */;
--- Test 8 switch internal charset --
stop slave;
include/wait_for_slave_to_stop.inc
reset master;
reset slave;
start slave;
include/wait_for_slave_to_start.inc
create table t4 (f text character set utf8);
create table t5 (f text character set cp932);
flush logs;
@ -378,3 +380,4 @@ a b
1 1
FLUSH LOGS;
DROP TABLE IF EXISTS t1, t2, t3, t04, t05, t4, t5;
include/rpl_end.inc