bzr commit into mysql-5.1-bugteam branch (alfranio.correia:2825) Bug#42861

[Alfranio Correia]

#At file:///home/acorreia/workspace.sun/repository.mysql/bzrwork/bug-42861/mysql-5.1-bugteam-push/ based on revid:alfranio.correia@stripped

 2825 Alfranio Correia	2009-03-23
      Post-fix BUG#42861.
modified:
  mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
  mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
  mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
  mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2009-03-18 10:31:17 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2009-03-23 01:07:25 +0000
@@ -10,6 +10,44 @@ insert into t1(b) values (1);
 insert into t1(b) values (2);
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;
 commit;
-Error in Begin_load_query event: write to '../../tmp/SQL_LOAD-2-1-1.data' failed
+show slave status;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_MYPORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	9
+Last_Error	Error in Begin_load_query event: write to '../../tmp/SQL_LOAD.data' failed
+Skip_Counter	0
+Exec_Master_Log_Pos	#
+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	9
+Last_SQL_Error	Error in Begin_load_query event: write to '../../tmp/SQL_LOAD.data' failed
 drop table t1;
 drop table t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result	2009-03-22 19:46:57 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result	2009-03-23 01:07:25 +0000
@@ -1,6 +1,6 @@
 CHANGE MASTER TO MASTER_USER='root',
 MASTER_CONNECT_RETRY=1,
 MASTER_HOST='127.0.0.1',
-MASTER_PORT=12500;
-start slave;
+MASTER_PORT=MASTER_MYPORT;
+START SLAVE;
 Unable to use slave's temporary directory ../../../error - Can't read dir of '../../../error' (Errcode: 2)

=== modified file 'mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2009-03-18 10:31:17 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2009-03-23 01:07:25 +0000
@@ -11,6 +11,7 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
 --source include/master-slave.inc
+--source include/not_embedded.inc
 
 ##########################################################################
 #                            Loading data
@@ -31,8 +32,10 @@ commit;
 connection slave;
 source include/wait_for_slave_sql_to_stop.inc;
 
-let $error=query_get_value("show slave status", Last_SQL_Error, 1);
-echo $error;
+--replace_result $MASTER_MYPORT MASTER_MYPORT
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
+--replace_regex /SQL_LOAD-[0-9]-[0-9]-[0-9]*/SQL_LOAD/
+query_vertical show slave status;
 
 ##########################################################################
 #                             Clean up

=== modified file 'mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test	2009-03-22 19:46:57 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test	2009-03-23 01:07:25 +0000
@@ -2,6 +2,9 @@
 # This test verifies if the start slave fails gracefuly when an 
 # invalid directory is used to set --slave-load-tmpdir.
 ##########################################################################
+--source include/have_log_bin.inc
+--source include/not_embedded.inc
+
 connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
 connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
 connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
@@ -9,12 +12,12 @@ connect (slave1,127.0.0.1,root,,test,$SL
 
 connection slave;
 
+--replace_result $MASTER_MYPORT MASTER_MYPORT
 eval CHANGE MASTER TO MASTER_USER='root',
                       MASTER_CONNECT_RETRY=1,
                       MASTER_HOST='127.0.0.1',
                       MASTER_PORT=$MASTER_MYPORT;
-
-start slave;
+START SLAVE;
 
 source include/wait_for_slave_sql_to_stop.inc;
 let $error=query_get_value("show slave status", Last_SQL_Error, 1);