mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
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
This commit is contained in:
parent
d0eea951f6
commit
17620c2d1f
7 changed files with 15 additions and 8 deletions
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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-'',
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
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;
|
||||
|
|
|
@ -36,7 +36,7 @@ select * from a;
|
|||
|
||||
# BUG#3461
|
||||
connection master;
|
||||
create table t1 (a int);
|
||||
create table t1 (a int primary key);
|
||||
create table t2 (a int);
|
||||
|
||||
insert into t1 values (1);
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
#
|
||||
# Test of replicating user variables
|
||||
#
|
||||
###########################################################
|
||||
# 2006-02-08 By JBM added order by for use w/ NDB engine
|
||||
###########################################################
|
||||
source include/master-slave.inc;
|
||||
|
||||
#save_master_pos;
|
||||
|
@ -20,7 +23,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;
|
||||
|
||||
set @var2= 'insert into t1 values (concat("from-var-", ?))';
|
||||
prepare stmt2 from @var2;
|
||||
|
@ -30,7 +33,7 @@ execute stmt2 using @var1;
|
|||
save_master_pos;
|
||||
connection slave;
|
||||
sync_with_master;
|
||||
select * from t1;
|
||||
SELECT * FROM t1 ORDER BY n;
|
||||
|
||||
connection master;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue