Commit 17620c2d authored by unknown's avatar unknown
Browse files

test updates 


mysql-test/t/rpl_ps.test:
  Added order by for use with NDB
mysql-test/r/rpl_ps.result:
  Added order by for use with NDB
mysql-test/t/rpl_multi_delete.test:
  Added pk for NDB engine
mysql-test/t/rpl_multi_delete2.test:
  Added pk for NDB engine
mysql-test/r/rpl_multi_delete.result:
  Added pk for NDB engine
mysql-test/r/rpl_multi_delete2.result:
  Added pk for NDB engine
mysql-test/t/rpl_loadfile.test:
  Added sleep for use with NDB
parent d0eea951

mysql-test/r/rpl_multi_delete.result

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ reset master; 
reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create table t1 (a int);

create table t1 (a int primary key);

create table t2 (a int);

insert into t1 values (1);

insert into t2 values (1);

mysql-test/r/rpl_multi_delete2.result

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ use mysqltest_to; 
select * from a;

i

3

create table t1 (a int);

create table t1 (a int primary key);

create table t2 (a int);

insert into t1 values (1);

insert into t2 values (1);

mysql-test/r/rpl_ps.result

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ set @var1= "from-master-1"; 
execute stmt1 using @var1;

set @var1= "from-master-2-'',";

execute stmt1 using @var1;

select * from t1;

SELECT * FROM t1 ORDER BY n;

n

from-master-1

from-master-2-'',
@@ -19,7 +19,7 @@ set @var2= 'insert into t1 values (concat("from-var-", ?))'; 
prepare stmt2 from @var2;

set @var1='from-master-3';

execute stmt2 using @var1;

select * from t1;

SELECT * FROM t1 ORDER BY n;

n

from-master-1

from-master-2-'',

mysql-test/t/rpl_loadfile.test

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ delimiter ;| 
CALL test.p1();

SELECT * FROM test.t1 ORDER BY blob_column;

save_master_pos;

# Need to allow some time when NDB engine is used for

# the injector thread to have time to populate binlog

sleep 10;

sync_slave_with_master;

connection slave;

SELECT * FROM test.t1 ORDER BY blob_column;

mysql-test/t/rpl_multi_delete.test

+2 −1
Original line number Diff line number Diff line 
source include/master-slave.inc;

create table t1 (a int);

create table t1 (a int primary key);

create table t2 (a int);



insert into t1 values (1);

insert into t2 values (1);





delete t1.* from t1, t2 where t1.a = t2.a;



save_master_pos;