Commit 77b1bb84 authored by unknown's avatar unknown
Browse files

Has issues with original tree, so had to pull new tree and copy test over.... 

Has issues with original tree, so had to pull new tree and copy test over. Running last test now and will push after


mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
mysql-test/t/rpl_extraCol_innodb-master.opt:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_innodb-master.opt
mysql-test/t/rpl_extraCol_innodb-slave.opt:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_innodb-slave.opt
mysql-test/t/rpl_extraCol_innodb.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_innodb.test
mysql-test/t/rpl_extraCol_myisam.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_myisam.test
mysql-test/r/rpl_extraCol_innodb.result:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/r/rpl_extraCol_innodb.result
mysql-test/r/rpl_extraCol_myisam.result:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/r/rpl_extraCol_myisam.result
mysql-test/r/rpl_ndb_extraCol.result:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/r/rpl_ndb_extraCol.result
mysql-test/t/rpl_ndb_extraCol.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_ndb_extraCol.test
mysql-test/extra/rpl_tests/rpl_ndb_ddl.test:
  BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/extra/rpl_tests/rpl_ndb_ddl.test
parent 88b5cf40

mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test

0 → 100644
+853 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/extra/rpl_tests/rpl_ndb_ddl.test

0 → 100644
+507 −0
Original line number Diff line number Diff line 
######################## rpl_ddl.test ########################

#                                                            #

# DDL statements (sometimes with implicit COMMIT) executed   #

# by the master and it's propagation into the slave          #

#                                                            #

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



#

# NOTE, PLEASE BE CAREFUL, WHEN MODIFYING THE TESTS !!

#

#      1. !All! objects to be dropped, renamed, altered ... must be created

#         in AUTOCOMMIT= 1 mode before AUTOCOMMIT is set to 0 and the test

#         sequences start.

#

#      2. Never use a test object, which was direct or indirect affected by a

#         preceeding test sequence again.

#         Except table d1.t1 where ONLY DML is allowed.

#

#         If one preceeding test sequence hits a (sometimes not good visible,

#         because the sql error code of the statement might be 0) bug

#         and these rules are ignored, a following test sequence might earn ugly

#         effects like failing 'sync_slave_with_master', crashes of the slave or

#         abort of the test case etc..

#

#      3. The assignment of the DDL command to be tested to $my_stmt can

#         be a bit difficult. "'" must be avoided, because the test

#         routine "include/rpl_stmt_seq.inc" performs a

#         eval SELECT CONCAT('######## ','$my_stmt','  ########') as "";

#



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

# Some preparations

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

# The sync_slave_with_master is needed to make the xids deterministic.

sync_slave_with_master;

connection master;



SET AUTOCOMMIT = 1;

#

# 1. DROP all objects, which probably already exist, but must be created here

#

--disable_warnings

DROP DATABASE IF EXISTS mysqltest1;

DROP DATABASE IF EXISTS mysqltest2;

DROP DATABASE IF EXISTS mysqltest3;

--enable_warnings

#

# 2. CREATE all objects needed

#    working database is mysqltest1

#    working (transactional!) is mysqltest1.t1 

#

CREATE DATABASE mysqltest1;

CREATE DATABASE mysqltest2;

eval CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE=$engine_type;

INSERT INTO mysqltest1.t1 SET f1= 0;

eval CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE=$engine_type;

CREATE INDEX my_idx6 ON mysqltest1.t6(f1);

eval CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE=$engine_type;

INSERT INTO mysqltest1.t7 SET f1= 0;

eval CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE=$engine_type;

eval CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE=$engine_type;

CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT);



#

# 3. master sessions: never do AUTOCOMMIT

#    slave  sessions: never do AUTOCOMMIT

#

SET AUTOCOMMIT = 0;

use mysqltest1;

sync_slave_with_master;

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

SET AUTOCOMMIT = 0;

use mysqltest1;

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log





# We don't want to abort the whole test if one statement sent

# to the server gets an error, because the following test

# sequences are nearly independend of the previous statements. 

--disable_abort_on_error



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

# Banal case: (explicit) COMMIT and ROLLBACK

# Just for checking if the test sequence is usable

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



let $my_stmt= COMMIT;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc



let $my_stmt= ROLLBACK;

let $my_master_commit= false;

let $my_slave_commit= false;

--source include/rpl_stmt_seq.inc



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

# Cases with commands very similar to COMMIT

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



let $my_stmt= SET AUTOCOMMIT=1;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SET AUTOCOMMIT=0;



let $my_stmt= START TRANSACTION;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc



let $my_stmt= BEGIN;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc



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

# Cases with (BASE) TABLES and (UPDATABLE) VIEWs

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



let $my_stmt= DROP TABLE mysqltest1.t2;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW TABLES LIKE 't2';

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

SHOW TABLES LIKE 't2';

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



# Note: Since this test is executed with a skip-innodb slave, the

# slave incorrectly commits the insert.  One can *not* have InnoDB on

# master and MyISAM on slave and expect that a transactional rollback

# after a CREATE TEMPORARY TABLE should work correctly on the slave.

# For this to work properly the handler on the slave must be able to 

# handle transactions (e.g. InnoDB or NDB).

let $my_stmt= DROP TEMPORARY TABLE mysqltest1.t23;

let $my_master_commit= false;

let $my_slave_commit= false;

--source include/rpl_stmt_seq.inc

SHOW TABLES LIKE 't23';

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

SHOW TABLES LIKE 't23';

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



let $my_stmt= RENAME TABLE mysqltest1.t3 to mysqltest1.t20;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW TABLES LIKE 't20';

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

SHOW TABLES LIKE 't20';

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



let $my_stmt= ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

describe mysqltest1.t4;

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

describe mysqltest1.t4;

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



let $my_stmt= CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE=;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq2.inc



# Note: Since this test is executed with a skip-innodb slave, the

# slave incorrectly commits the insert.  One can *not* have InnoDB on

# master and MyISAM on slave and expect that a transactional rollback

# after a CREATE TEMPORARY TABLE should work correctly on the slave.

# For this to work properly the handler on the slave must be able to 

# handle transactions (e.g. InnoDB or NDB).

let $engine='';

let $eng_type='';



let $my_stmt= CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT);

let $my_master_commit= false;

let $my_slave_commit= false;

--source include/rpl_stmt_seq.inc



let $my_stmt= TRUNCATE TABLE mysqltest1.t7;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SELECT * FROM mysqltest1.t7;

--echo -------- switch to slave --------

sync_slave_with_master;

SELECT * FROM mysqltest1.t7;

--echo -------- switch to master -------

connection master;



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

# Cases with LOCK/UNLOCK

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



# MySQL insists in locking mysqltest1.t1, because rpl_stmt_seq performs an

# INSERT into this table.

let $my_stmt= LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

UNLOCK TABLES;



# No prior locking

let $my_stmt= UNLOCK TABLES;

let $my_master_commit= false;

let $my_slave_commit= false;

--source include/rpl_stmt_seq.inc



# With prior read locking

# Note that this test generate an error since the rpl_stmt_seq.inc

# tries to insert into t1.

LOCK TABLES mysqltest1.t1 READ;

let $my_stmt= UNLOCK TABLES;

let $my_master_commit= false;

let $my_slave_commit= false;

--source include/rpl_stmt_seq.inc



# With prior write locking

LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ;

let $my_stmt= UNLOCK TABLES;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc



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

# Cases with INDEXES

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



let $my_stmt= DROP INDEX my_idx6 ON mysqltest1.t6;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW INDEX FROM mysqltest1.t6;

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

SHOW INDEX FROM mysqltest1.t6;

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



let $my_stmt= CREATE INDEX my_idx5 ON mysqltest1.t5(f1);

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW INDEX FROM mysqltest1.t5;

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

SHOW INDEX FROM mysqltest1.t5;

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



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

# Cases with DATABASE

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



let $my_stmt= DROP DATABASE mysqltest2;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW DATABASES LIKE "mysqltest2";

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

SHOW DATABASES LIKE "mysqltest2";

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



let $my_stmt= CREATE DATABASE mysqltest3;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW DATABASES LIKE "mysqltest3";

connection slave;

--disable_query_log

SELECT '-------- switch to slave --------' as "";

--enable_query_log

SHOW DATABASES LIKE "mysqltest3";

connection master;

--disable_query_log

SELECT '-------- switch to master -------' as "";

--enable_query_log



# End of 4.1 tests



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

# Cases with stored procedures

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

let $my_stmt= CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1";

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

--vertical_results

--replace_column 5 # 6 #

SHOW PROCEDURE STATUS LIKE 'p1';

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

--replace_column 5 # 6 #

SHOW PROCEDURE STATUS LIKE 'p1';

connection master;

--horizontal_results



let $my_stmt= ALTER PROCEDURE p1 COMMENT "I have been altered";

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

--vertical_results

--replace_column 5 # 6 #

SHOW PROCEDURE STATUS LIKE 'p1';

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

--replace_column 5 # 6 #

SHOW PROCEDURE STATUS LIKE 'p1';

connection master;

--horizontal_results



let $my_stmt= DROP PROCEDURE p1;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

--vertical_results

SHOW PROCEDURE STATUS LIKE 'p1';

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

SHOW PROCEDURE STATUS LIKE 'p1';

connection master;

--horizontal_results



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

# Cases with VIEWs

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

let $my_stmt= CREATE OR REPLACE VIEW v1 as select * from t1;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW CREATE VIEW v1;

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

SHOW CREATE VIEW v1;

connection master;



let $my_stmt= ALTER VIEW v1 AS select f1 from t1;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW CREATE VIEW v1;

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

SHOW CREATE VIEW v1;

connection master;



let $my_stmt= DROP VIEW IF EXISTS v1;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

--error 1146

SHOW CREATE VIEW v1;

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

--error 1146

SHOW CREATE VIEW v1;

connection master;



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

# Cases with TRIGGERs

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

let $my_stmt= CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW TRIGGERS;

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

SHOW TRIGGERS;

connection master;



let $my_stmt= DROP TRIGGER trg1;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SHOW TRIGGERS;

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

SHOW TRIGGERS;

connection master;



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

# Cases with USERs

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

let $my_stmt= CREATE USER user1@localhost;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SELECT user FROM mysql.user WHERE user = 'user1';

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

SELECT user FROM mysql.user WHERE user = 'user1';

connection master;



let $my_stmt= RENAME USER user1@localhost TO rename1@localhost;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SELECT user FROM mysql.user WHERE user = 'rename1';

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

SELECT user FROM mysql.user WHERE user = 'rename1';

connection master;



let $my_stmt= DROP USER rename1@localhost;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

SELECT user FROM mysql.user WHERE user = 'rename1';

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

SELECT user FROM mysql.user WHERE user = 'rename1';

connection master;



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

# Cleanup

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

--disable_warnings

DROP DATABASE IF EXISTS mysqltest1;

DROP DATABASE IF EXISTS mysqltest2;

DROP DATABASE IF EXISTS mysqltest3;

--enable_warnings



-- source include/master-slave-end.inc

mysql-test/r/rpl_extraCol_innodb.result

0 → 100644
+741 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/rpl_extraCol_myisam.result

0 → 100644
+741 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/rpl_ndb_ddl.result

+10 −15
Original line number Diff line number Diff line
@@ -359,8 +359,6 @@ MAX(f1) 


-------- switch to master -------

ROLLBACK;

Warnings:

Warning	1196	Some non-transactional changed tables couldn't be rolled back

SELECT MAX(f1) FROM t1;

MAX(f1)

5
@@ -370,9 +368,9 @@ TEST-INFO: MASTER: The INSERT is not committed (Succeeded) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

6

5



TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)

TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)



-------- switch to master -------

flush logs;
@@ -401,7 +399,7 @@ MAX(f1) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

6

5



-------- switch to master -------

RENAME TABLE mysqltest1.t3 to mysqltest1.t20;
@@ -506,7 +504,7 @@ f2 bigint(20) YES NULL 


-------- switch to master -------



######## CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"  ########

######## CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "NDB"  ########



-------- switch to master -------

INSERT INTO t1 SET f1= 7 + 1;
@@ -520,7 +518,7 @@ MAX(f1) 
7



-------- switch to master -------

CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB";

CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "NDB";

SELECT MAX(f1) FROM t1;

MAX(f1)

8
@@ -579,8 +577,6 @@ MAX(f1) 


-------- switch to master -------

ROLLBACK;

Warnings:

Warning	1196	Some non-transactional changed tables couldn't be rolled back

SELECT MAX(f1) FROM t1;

MAX(f1)

8
@@ -590,9 +586,9 @@ TEST-INFO: MASTER: The INSERT is not committed (Succeeded) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

9

8



TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)

TEST-INFO: SLAVE:  The INSERT is not committed (Succeeded)



-------- switch to master -------

flush logs;
@@ -613,7 +609,7 @@ MAX(f1) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

9

8



-------- switch to master -------

TRUNCATE TABLE mysqltest1.t7;
@@ -650,11 +646,9 @@ flush logs; 
-------- switch to master -------

SELECT * FROM mysqltest1.t7;

f1



-------- switch to slave --------

SELECT * FROM mysqltest1.t7;

f1



-------- switch to master -------



######## LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ  ########
@@ -957,7 +951,7 @@ t5 1 my_idx5 1 f1 A 0 NULL NULL YES BTREE 
-------- switch to slave --------

SHOW INDEX FROM mysqltest1.t5;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t5	1	my_idx5	1	f1	A	NULL	NULL	NULL	YES	BTREE	

t5	1	my_idx5	1	f1	A	0	NULL	NULL	YES	BTREE	



-------- switch to master -------
@@ -1691,3 +1685,4 @@ user 
DROP DATABASE IF EXISTS mysqltest1;

DROP DATABASE IF EXISTS mysqltest2;

DROP DATABASE IF EXISTS mysqltest3;

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction