Commit 0c2a0e80 authored by sven@riska.(none)'s avatar sven@riska.(none)
Browse files

Merge riska.(none):/home/sven/bk/b36379-enable_test/gca 

into  riska.(none):/home/sven/bkroot/5.1-bugteam
parents c21dbf27 cf7c15fe

mysql-test/suite/rpl/r/rpl_ddl.result

+32 −20
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ TEST-INFO: MASTER: The INSERT is not committed (Succeeded) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

5

6



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

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



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

SHOW TABLES LIKE 't23';
@@ -445,7 +445,7 @@ MAX(f1) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

5

6



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

RENAME TABLE mysqltest1.t3 to mysqltest1.t20;
@@ -614,9 +614,9 @@ TEST-INFO: MASTER: The INSERT is not committed (Succeeded) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

8

9



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

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



-------- switch to master -------
@@ -631,7 +631,7 @@ MAX(f1) 
-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

8

9



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

TRUNCATE TABLE mysqltest1.t7;
@@ -1086,6 +1086,9 @@ Modified # 
Created	#

Security_type	DEFINER

Comment	

character_set_client	latin1

collation_connection	latin1_swedish_ci

Database Collation	latin1_swedish_ci



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

SHOW PROCEDURE STATUS LIKE 'p1';
@@ -1097,6 +1100,9 @@ Modified # 
Created	#

Security_type	DEFINER

Comment	

character_set_client	latin1

collation_connection	latin1_swedish_ci

Database Collation	latin1_swedish_ci



-------- switch to master -------
@@ -1149,6 +1155,9 @@ Modified # 
Created	#

Security_type	DEFINER

Comment	I have been altered

character_set_client	latin1

collation_connection	latin1_swedish_ci

Database Collation	latin1_swedish_ci



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

SHOW PROCEDURE STATUS LIKE 'p1';
@@ -1160,6 +1169,9 @@ Modified # 
Created	#

Security_type	DEFINER

Comment	I have been altered

character_set_client	latin1

collation_connection	latin1_swedish_ci

Database Collation	latin1_swedish_ci



-------- switch to master -------
@@ -1251,13 +1263,13 @@ TEST-INFO: SLAVE: The INSERT is committed (Succeeded) 


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

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`

View	Create View	character_set_client	collation_connection

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`	latin1	latin1_swedish_ci



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

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`

View	Create View	character_set_client	collation_connection

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`	latin1	latin1_swedish_ci



-------- switch to master -------
@@ -1302,13 +1314,13 @@ TEST-INFO: SLAVE: The INSERT is committed (Succeeded) 


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

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`

View	Create View	character_set_client	collation_connection

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`	latin1	latin1_swedish_ci



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

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`

View	Create View	character_set_client	collation_connection

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1`	latin1	latin1_swedish_ci



-------- switch to master -------
@@ -1402,13 +1414,13 @@ TEST-INFO: SLAVE: The INSERT is committed (Succeeded) 


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

SHOW TRIGGERS;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation

trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci



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

SHOW TRIGGERS;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation

trg1	INSERT	t1	SET @a:=1	BEFORE	NULL		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci



-------- switch to master -------
@@ -1453,11 +1465,11 @@ TEST-INFO: SLAVE: The INSERT is committed (Succeeded) 


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

SHOW TRIGGERS;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation



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

SHOW TRIGGERS;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation



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

mysql-test/suite/rpl/r/rpl_innodb_bug28430.result

+0 −39
Original line number Diff line number Diff line
@@ -114,45 +114,6 @@ Create Table CREATE TABLE `byrange_tbl` ( 
  `filler` varchar(255) DEFAULT NULL,

  PRIMARY KEY (`id`)

) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (id) SUBPARTITION BY HASH (id) SUBPARTITIONS 2 (PARTITION pa1 VALUES LESS THAN (10) ENGINE = InnoDB, PARTITION pa2 VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION pa3 VALUES LESS THAN (30) ENGINE = InnoDB, PARTITION pa4 VALUES LESS THAN (40) ENGINE = InnoDB, PARTITION pa5 VALUES LESS THAN (50) ENGINE = InnoDB, PARTITION pa6 VALUES LESS THAN (60) ENGINE = InnoDB, PARTITION pa7 VALUES LESS THAN (70) ENGINE = InnoDB, PARTITION pa8 VALUES LESS THAN (80) ENGINE = InnoDB, PARTITION pa9 VALUES LESS THAN (90) ENGINE = InnoDB, PARTITION pa10 VALUES LESS THAN (100) ENGINE = InnoDB, PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */

SHOW SLAVE STATUS;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	root

Master_Port	MASTER_PORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	945470

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	#

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	945470

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	No

Master_SSL_CA_File	

Master_SSL_CA_Path	

Master_SSL_Cert	

Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	0

Last_SQL_Error	

SELECT count(*) "Slave norm" FROM test.regular_tbl;

Slave norm	500

SELECT count(*) "Slave bykey" FROM test.bykey_tbl;

mysql-test/suite/rpl/t/disabled.def

+0 −2
Original line number Diff line number Diff line
@@ -10,6 +10,4 @@ 
#

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



rpl_ddl                  : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master

rpl_innodb_bug28430      : Bug #32247 2007-11-27 mats Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table)

rpl_redirect               : Failure is sporadic and and the test is superfluous (mats)

mysql-test/suite/rpl/t/rpl_innodb_bug28430.test

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ SELECT count(*) as "Master byrange" FROM test.byrange_tbl; 
--sync_slave_with_master

connection slave;

show create table test.byrange_tbl;

source include/show_slave_status.inc;

SELECT count(*) "Slave norm" FROM test.regular_tbl;

SELECT count(*) "Slave bykey" FROM test.bykey_tbl;

SELECT count(*) "Slave byrange" FROM test.byrange_tbl;