Commit 8ba8688d authored by unknown's avatar unknown
Browse files

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug


mysql-test/t/disabled.def:
  Auto merged
parents 1e869b0e d1620466

mysql-test/r/rpl_deadlock_innodb.result

+9 −9
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ Master_User root 
Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	18911

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -59,13 +59,13 @@ Slave_SQL_Running Yes 
Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Ignore_Table	#

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	18911

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File
@@ -99,7 +99,7 @@ Master_User root 
Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	18911

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -108,13 +108,13 @@ Slave_SQL_Running Yes 
Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Ignore_Table	#

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	18911

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File
@@ -150,7 +150,7 @@ Master_User root 
Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	18911

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001
@@ -159,13 +159,13 @@ Slave_SQL_Running Yes 
Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Ignore_Table	#

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	18911

Exec_Master_Log_Pos	#

Relay_Log_Space	#

Until_Condition	None

Until_Log_File

mysql-test/t/disabled.def

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ ndb_cache2 : BUG#18597 2006-03-28 brian simultaneous drop table an 
ndb_cache_multi2         : BUG#18597 2006-04-10 kent  simultaneous drop table and ndb statistics update triggers node failure

partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table

ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open

rpl_deadlock_innodb      : BUG#16920 2006-04-12 kent    fails in show slave status (randomly)

rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated

rpl_ndb_2myisam          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated

rpl_ndb_auto_inc         : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and auto_increment_offset produce duplicate key er
@@ -34,7 +33,6 @@ rpl_row_blob_innodb : BUG#18980 2006-04-10 kent Test fails randomly 
rpl_row_func003		 : BUG#19074 2006-13-04 andrei  test failed

rpl_row_inexist_tbl      : BUG#18948 2006-03-09 mats    Disabled since patch makes this test wait forever

rpl_sp                   : BUG#16456 2006-02-16 jmiller

rpl_until                : BUG#15886 2006-02-16 jmiller Unstable test case

mysqldump                : BUG#18078 2006-03-10 lars

udf                      : BUG#18564 2006-03-27 ian     (Permission by Brian)