bzr push into mysql-trunk branch (nuno.carvalho:3782 to 3783) Bug#14021292

[Nuno Carvalho]

 3783 Nuno Carvalho	2012-05-24
      BUG#14021292 - 65152: MYSQL CAN'T START IF RELAY LOGS ARE REMOVED AND SKIP_SLAVE_START = 0
      
      Updated rpl.rpl_binlog_index to new slave start behaviour, when relay 
      log file name is changed directly on mysql.slave_relay_log_info table
      after a missing relay log file error a server restart is required.

    modified:
      mysql-test/suite/rpl/t/rpl_binlog_index.test
 3782 Tatjana Azundris Nuernberg	2012-05-24
      disabling variables-notembedded until Bug#13431369 is fixed on Windows

    modified:
      mysql-test/t/disabled.def
=== modified file 'mysql-test/suite/rpl/t/rpl_binlog_index.test'
--- a/mysql-test/suite/rpl/t/rpl_binlog_index.test	2012-04-17 16:41:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_binlog_index.test	2012-05-24 13:33:48 +0000
@@ -221,7 +221,6 @@ if (`SELECT @@GLOBAL.relay_log_info_repo
 if (`SELECT @@GLOBAL.relay_log_info_repository = 'TABLE'`)
 {
   --disable_query_log
-  --connection slave
   SET SQL_LOG_BIN=0;
 
   # On server startup, the slave info tables are initialized,
@@ -243,12 +242,20 @@ if (`SELECT @@GLOBAL.relay_log_info_repo
   --eval UPDATE mysql.slave_relay_log_info SET Relay_log_name='$slave_datadir$path_separator$new_relay_log_name'
   SET SQL_LOG_BIN=1;
 
-  --let path_separator=
+  --let $path_separator=
   --let $relay_log_name=
   --let $new_relay_log_name=
   --let $relocate_fix_relay_log_info=
 
   --enable_query_log
+
+  # Due to changes on slave start procedure (relay log initialization
+  # error requires RESET SLAVE or server restart) we need to restart
+  # server to relay log file change be considered.
+  --let $include_silent= 1
+  --let $rpl_server_number= 2
+  --source include/rpl_restart_server.inc
+  --let $include_silent= 0
 }
 
 # The slave will restart if we have fixed the relay-log.info

No bundle (reason: useless for push emails).