bzr push into mysql-6.0 branch (mats:2685 to 2686)

[Mats Kindahl]

 2686 Mats Kindahl	2008-09-18
      Blanking out Last_IO_Errno in output for SHOW SLAVE STATUS for rpl_locktrans_myisam
      and rpl_row_tabledefs_* tests since they are not relevant for the test.
modified:
  mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
  mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
  mysql-test/suite/rpl/t/rpl_locktrans_myisam.test

 2685 Mats Kindahl	2008-09-18
      Fixes to eliminate some red in the 6.0-rpl-merge tree
modified:
  mysql-test/t/completion_type_func.test
  sql/sql_repl.cc

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_tabledefs.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2008-02-12 10:31:10 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2008-09-18 12:10:00 +0000
@@ -122,7 +122,7 @@ INSERT INTO t1_nodef VALUES (1,2);
 connection slave;
 --source include/wait_for_slave_sql_to_stop.inc
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 36 <Last_IO_Error> 38 <Last_SQL_Error>
+--replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 # 36 <Last_IO_Error> 38 <Last_SQL_Error>
 --query_vertical SHOW SLAVE STATUS
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_locktrans_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result	2008-06-26 18:56:36 +0000
+++ b/mysql-test/suite/rpl/r/rpl_locktrans_myisam.result	2008-09-18 12:10:00 +0000
@@ -402,7 +402,7 @@ ERROR 0A000: LOCK is not allowed in stor
 SET AUTOCOMMIT= 1;
 UNLOCK TABLES;
 DROP TABLE t1, t2;
-show slave status;;
+show slave status;
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
@@ -418,7 +418,7 @@ 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
@@ -437,7 +437,7 @@ Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
+Last_IO_Errno	#
+Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	

=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2008-02-12 10:31:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2008-09-18 12:10:00 +0000
@@ -140,7 +140,7 @@ Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
+Last_IO_Errno	#
 Last_IO_Error	<Last_IO_Error>
 Last_SQL_Errno	1364
 Last_SQL_Error	<Last_SQL_Error>

=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2008-02-12 10:31:10 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2008-09-18 12:10:00 +0000
@@ -140,7 +140,7 @@ Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
+Last_IO_Errno	#
 Last_IO_Error	<Last_IO_Error>
 Last_SQL_Errno	1364
 Last_SQL_Error	<Last_SQL_Error>

=== modified file 'mysql-test/suite/rpl/t/rpl_locktrans_myisam.test'
--- a/mysql-test/suite/rpl/t/rpl_locktrans_myisam.test	2008-02-19 12:45:37 +0000
+++ b/mysql-test/suite/rpl/t/rpl_locktrans_myisam.test	2008-09-18 12:10:00 +0000
@@ -25,6 +25,5 @@ let $other_non_trans_engine_type= MyISAM
 sync_slave_with_master;
 connection slave;
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
---query_vertical show slave status;
-
+--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 #
+query_vertical show slave status;