Commit 545ac7f3 authored by unknown's avatar unknown
Browse files

test updates 


mysql-test/t/rpl_trigger.test:
  Test cleanup
mysql-test/t/rpl_ndb_sync.test:
  Test cleanup
mysql-test/t/rpl_ndb_idempotent.test:
  Test cleanup
mysql-test/r/rpl_trigger.result:
  Updated result files
mysql-test/r/rpl_ndb_sync.result:
  Updated result files
mysql-test/r/rpl_ndb_idempotent.result:
  Updated result files
mysql-test/t/rpl_ndb_dd_basic.test:
  Rename: mysql-test/t/rpl_ndb_disk.test -> mysql-test/t/rpl_ndb_dd_basic.test
mysql-test/r/rpl_ndb_dd_basic.result:
  Rename: mysql-test/t/rpl_ndb_dd_basic.result -> mysql-test/r/rpl_ndb_dd_basic.result
mysql-test/r/rpl_ndb_sp006.result:
  New results file
mysql-test/t/rpl_row_sp007_innodb-slave.opt:
  Ensure slave tables are created as innodb
mysql-test/t/disabled.def:
  updated 17290
mysql-test/r/rpl_ndb_sp007.result:
  New results file
mysql-test/t/rpl_ndb_sp007.test:
  Added comment
mysql-test/t/rpl_ndb_sp006.test:
  Added comment
mysql-test/extra/rpl_tests/rpl_row_sp003.test:
  Augmented for use with NDB due to injector thread not populating the bin log before sync with master is done
mysql-test/r/rpl_ndb_sp003.result:
  New results file
mysql-test/t/rpl_ndb_sp003.test:
  Wrapper to use same code for testing NDB that is used for InnoDB Currently
parent 17620c2d

mysql-test/extra/rpl_tests/rpl_row_sp003.test

+4 −1
Original line number Diff line number Diff line
@@ -46,7 +46,10 @@ CALL test.p2(); 
SELECT release_lock("test");

SELECT * FROM test.t1; 

#show binlog events;



# Added sleep for use with NDB to ensure that

# the injector thread will populate log before

# we switch to the slave.

sleep 5;

sync_slave_with_master;

connection slave;

SELECT * FROM test.t1;

mysql-test/r/rpl_ndb_idempotent.result

+1 −0
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ row2 new on slave 2 
SHOW SLAVE STATUS;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	Yes	Yes				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>

DROP TABLE IF EXISTS t1;

mysql-test/r/rpl_ndb_sp003.result

0 → 100644
+49 −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 PROCEDURE IF EXISTS test.p1;

DROP PROCEDURE IF EXISTS test.p2;

DROP TABLE IF EXISTS test.t1;

CREATE TABLE test.t1(a INT,PRIMARY KEY(a))ENGINE=NDBCLUSTER;

CREATE PROCEDURE test.p1()

BEGIN

INSERT INTO test.t1 VALUES (4);

SELECT  get_lock("test", 100);

UPDATE test.t1 set a=a+4 WHERE a=4;

END|

CREATE PROCEDURE test.p2()

BEGIN

UPDATE test.t1 SET a=a+1;

END|

SELECT get_lock("test", 200);

get_lock("test", 200)

1

 CALL test.p1();

CALL test.p2();

SELECT release_lock("test");

release_lock("test")

1

SELECT * FROM test.t1;

a

5

SELECT * FROM test.t1;

a

5

DROP TABLE IF EXISTS test.t1;

CREATE TABLE test.t1(a INT,PRIMARY KEY(a))ENGINE=NDBCLUSTER;

CALL test.p2();

CALL test.p1();

get_lock("test", 100)

0

SELECT * FROM test.t1;

a

8

SELECT * FROM test.t1;

a

8

DROP PROCEDURE IF EXISTS test.p1;

DROP PROCEDURE IF EXISTS test.p2;

DROP TABLE IF EXISTS test.t1;

mysql-test/r/rpl_ndb_sp006.result

0 → 100644
+45 −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 database if not exists mysqltest1;

DROP PROCEDURE IF EXISTS mysqltest1.p1;

DROP PROCEDURE IF EXISTS mysqltest1.p2;

DROP TABLE IF EXISTS mysqltest1.t2;

DROP TABLE IF EXISTS mysqltest1.t1;

CREATE TABLE IF NOT EXISTS mysqltest1.t1(name CHAR(16), birth DATE,PRIMARY KEY(name))ENGINE=NDBCLUSTER;

CREATE TABLE IF NOT EXISTS mysqltest1.t2(name CHAR(16), age INT ,PRIMARY KEY(name))ENGINE=NDBCLUSTER;

CREATE PROCEDURE mysqltest1.p1()

BEGIN

DECLARE done INT DEFAULT 0;

DECLARE spa CHAR(16);

DECLARE spb INT;

DECLARE cur1 CURSOR FOR SELECT name, 

(YEAR(CURDATE())-YEAR(birth))-(RIGHT(CURDATE(),5)<RIGHT(birth,5)) 

FROM mysqltest1.t1;

DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = 1;

OPEN cur1;

SET AUTOCOMMIT=0;

REPEAT

FETCH cur1 INTO spa, spb;

IF NOT done THEN

START TRANSACTION;

INSERT INTO mysqltest1.t2 VALUES (spa,spb);

COMMIT;

END IF;

UNTIL done END REPEAT;

SET AUTOCOMMIT=1;

CLOSE cur1;

END|

CREATE PROCEDURE mysqltest1.p2()

BEGIN

INSERT INTO mysqltest1.t1 VALUES ('MySQL','1993-02-04'),('ROCKS', '1990-08-27'),('Texas', '1999-03-30'),('kyle','2005-1-1');

END|

CALL mysqltest1.p2();

CALL mysqltest1.p1();

DROP PROCEDURE IF EXISTS mysqltest1.p1;

DROP PROCEDURE IF EXISTS mysqltest1.p2;

DROP TABLE IF EXISTS mysqltest1.t1;

DROP TABLE IF EXISTS mysqltest1.t2;