Commit 509ceca6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/my/mysql-5.0 

into  mysql.com:/space/my/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
parents ac36a084 b04f21b5

mysql-test/r/mysqltest.result

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ root@localhost 
--------------------------------------------------------------------------------

this will be executed

this will be executed

mysqltest: At line 2: query 'create table t1 (a int primary key);

mysqltest: At line 3: query 'create table t1 (a int primary key);

insert into t1 values (1);

select 'select-me';

insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz 'error query'' at line 1

mysql-test/r/rpl_deadlock.result

+1 −1
Original line number Diff line number Diff line
@@ -83,5 +83,5 @@ a 
22

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

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	Yes	Yes							0		0	18911	#	None		0	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	#	Yes							0		0	18911	#	None		0	No						#

drop table t1,t2,t3,t4;

mysql-test/r/rpl_relayrotate.result

+0 −3
Original line number Diff line number Diff line
@@ -16,7 +16,4 @@ master_pos_wait('master-bin.001',3000)>=0 
select max(a) from t1;

max(a)

8000

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

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	735186	#	#	master-bin.000001	Yes	Yes							0		0	735186	#	None		0	No						#

drop table t1;

mysql-test/r/rpl_until.result

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ n 
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

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	608	#	Relay	slave-relay-bin.000004	746	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	#	No							0		0	608	#	Relay	slave-relay-bin.000004	746	No						#

start slave;

stop slave;

start slave until master_log_file='master-bin.000001', master_log_pos=776;

mysql-test/t/disabled.def

+0 −3
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ 
##############################################################################



sp-goto         : GOTO is currently is disabled - will be fixed in the future

rpl_relayrotate : Unstable test case, bug#12429

rpl_until       : Unstable test case, bug#12429

rpl_deadlock    : Unstable test case, bug#12429

kill            : Unstable test case, bug#9712

ndb_cache2      : Bug #15004

ndb_cache_multi2: Bug #15004