Commit 73bf3f02 authored by unknown's avatar unknown
Browse files

Test updates 


mysql-test/t/rpl_ndb_delete_nowhere.test:
  new wrapper for NDB engine
mysql-test/r/rpl_ndb_delete_nowhere.result:
  new reults file
mysql-test/t/disabled.def:
  Added test to be diabled
mysql-test/t/rpl_delete_no_where.test:
  Fix typo
mysql-test/t/rpl_EE_err.test:
  Updated wrapper
mysql-test/extra/rpl_tests/rpl_trig004.test:
  Updated
mysql-test/t/rpl_row_trig004.test:
  Updated
mysql-test/r/rpl_row_trig004.result:
  Updated
mysql-test/t/rpl_ndb_trig004.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_trig004.result:
  New result
parent aa0e7860

mysql-test/extra/rpl_tests/rpl_trig004.test

+9 −2
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ 
# TEST: Use after insert and before inset triggers and stored procdures to  #

#       Update and insert data                                              #

#############################################################################



# Change Auth: JBM                                 #

# Date: 2006-02-14                                 #

# Change: Added error, sleep and comments (ndb)    #

####################################################



# Begin clean up test section

connection master;
@@ -25,12 +28,16 @@ CREATE TRIGGER test.t1_bi_t2 BEFORE INSERT ON test.t2 FOR EACH ROW INSERT INTO t 
delimiter ;//



INSERT INTO test.t2 VALUES (1, 0.0);

--error 0,1062

# Expect duplicate error 1022 == ndb

--error 1022,1062

INSERT INTO test.t2 VALUES (1, 0.0);



#show binlog events; 

select * from test.t1;

select * from test.t2;

# Have to sleep for a few seconds to allow 

# NDB injector thread to populate binlog

sleep 10;

sync_slave_with_master;

connection slave;

select * from test.t1;

mysql-test/r/rpl_ndb_delete_nowhere.result

0 → 100644
+15 −0
Original line number Diff line number Diff line 
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;

create table t1 (a int, b int) engine=NDB;

insert into t1 values(1,1);

select * from t1;

a	b

1	1

delete from t1;

select * from t1;

a	b

drop table t1;

mysql-test/r/rpl_ndb_trig004.result

0 → 100644
+30 −0
Original line number Diff line number Diff line 
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;

DROP TRIGGER test.t1_bi_t2;

DROP TABLE IF EXISTS test.t1;

DROP TABLE IF EXISTS test.t2;

CREATE TABLE test.t1 (n MEDIUMINT NOT NULL AUTO_INCREMENT, d FLOAT, PRIMARY KEY(n))ENGINE=NDB;

CREATE TABLE test.t2 (n MEDIUMINT NOT NULL, f FLOAT, PRIMARY KEY(n))ENGINE=NDB;

CREATE TRIGGER test.t1_bi_t2 BEFORE INSERT ON test.t2 FOR EACH ROW INSERT INTO test.t1 VALUES (NULL, 1.234)//

INSERT INTO test.t2 VALUES (1, 0.0);

INSERT INTO test.t2 VALUES (1, 0.0);

Got one of the listed errors

select * from test.t1;

n	d

1	1.234

select * from test.t2;

n	f

1	0

select * from test.t1;

n	d

1	1.234

select * from test.t2;

n	f

1	0

DROP TRIGGER test.t1_bi_t2;

DROP TABLE test.t1;

DROP TABLE test.t2;

mysql-test/r/rpl_row_trig004.result

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ CREATE TABLE test.t2 (n MEDIUMINT NOT NULL, f FLOAT, PRIMARY KEY(n))ENGINE=INNOD 
CREATE TRIGGER test.t1_bi_t2 BEFORE INSERT ON test.t2 FOR EACH ROW INSERT INTO test.t1 VALUES (NULL, 1.234)//

INSERT INTO test.t2 VALUES (1, 0.0);

INSERT INTO test.t2 VALUES (1, 0.0);

Got one of the listed errors

select * from test.t1;

n	d

1	1.234

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ rpl_bit_npk : Bug#13418 
rpl_ddl              : Bug#15963 SBR does not show "Definer" correctly

rpl_ndb_auto_inc     : Bug#17086

rpl_ndb_basic        : Bug#16228 [IN REVIEW]

rpl_ndb_delete_nowhere : Bug#17400: Cluster Replication: delete of rows in table without pk fails

rpl_ndb_relay_space  : Bug#16993

rpl_ndb_sp007        : Bug #17290

rpl_sp               : Bug#16456