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

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl

Browse Source 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


BitKeeper/deleted/.del-binlog_start_comment.result:
  Auto merged
BitKeeper/deleted/.del-binlog_start_comment.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Manual merge.
This commit is contained in:
unknown
2008-01-11 16:32:31 +01:00
parent 27e1a36df9 01c2de4077
commit 97fa536a92
5 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/binlog_start_comment.result
View File

@@ -1,14 +0,0 @@
drop table if exists t1,t2;
create table t1 (word varchar(20)) -- create table t1;
create table t2 (word varchar(20)) -- create table t2;
load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
insert into t2 values ("Ada");
flush logs;
select * from t2;
word
Ada
flush logs;
select * from t2;
word
Ada
drop table t1,t2;

0
mysql-test/r/binlog_unsafe.result → mysql-test/suite/binlog/r/binlog_unsafe.result
View File

0
mysql-test/t/binlog_unsafe.test → mysql-test/suite/binlog/t/binlog_unsafe.test
View File

2
mysql-test/suite/rpl/t/rpl_row_sp005.test
View File

@@ -86,11 +86,13 @@ connection master;
CALL test.p1(); CALL test.p1();
let $wait_condition= SELECT COUNT(*) = 4 FROM t3; let $wait_condition= SELECT COUNT(*) = 4 FROM t3;
--source include/wait_condition.inc --source include/wait_condition.inc
save_master_pos;
SELECT * FROM test.t3 ORDER BY id3; SELECT * FROM test.t3 ORDER BY id3;
let $message=< ---- Slave selects-- >; let $message=< ---- Slave selects-- >;
--source include/show_msg.inc --source include/show_msg.inc
connection slave; connection slave;
sync_with_master;
SELECT * FROM test.t3 ORDER BY id3; SELECT * FROM test.t3 ORDER BY id3;
connection master; connection master;

18
mysql-test/t/binlog_start_comment.test
View File

@@ -1,18 +0,0 @@
# Test case for bug#32205 Replaying statements from mysqlbinlog fails
# with a syntax error, replicates fine
-- source include/have_log_bin.inc
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
create table t1 (word varchar(20)) -- create table t1;
create table t2 (word varchar(20)) -- create table t2;
load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
insert into t2 values ("Ada");
flush logs;
select * from t2;
--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 | $MYSQL
flush logs;
select * from t2;
drop table t1,t2;