bzr commit into mysql-6.0-rpl branch (aelkin:2763) Bug#41017

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/mysql-6.0-rpl/ based on revid:alfranio.correia@stripped

 2763 Andrei Elkin	2008-12-19
      Bug #41017 main.events_restart fails in pushbuild: "Server failed to restart"
            
      The reason of the bug was an incorrect name for the mtr-test expect file.
            
      The name was corrected in the restart macro. Detailed comments in the macro 
      would serve as some protection from the same thing happened again.
      Bug #40636 was found as a dup for the current.
modified:
  mysql-test/include/restart_mysqld.inc
  mysql-test/suite/falcon/t/disabled.def

per-file messages:
  mysql-test/suite/falcon/t/disabled.def
    re-enabling falcon_bug_28095.
=== modified file 'mysql-test/include/restart_mysqld.inc'
--- a/mysql-test/include/restart_mysqld.inc	2008-12-15 12:41:31 +0000
+++ b/mysql-test/include/restart_mysqld.inc	2008-12-19 13:10:10 +0000
@@ -1,7 +1,19 @@
+#
+# A macro to restart a certain server.
+# The caller can call `let $server_id_for_restart = N' prior
+# invocation for the macro to change the default server id
 
+let $server_id_for_restart = 1;
+
+#
 # Write file to make mysql-test-run.pl expect the "crash", but don't start
-# it until it's told to
---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+# it until it's told to.
+# The name of the expect file must correspond to one that mtr expects
+# which is a name of the section for the server in the server's configuration
+# file.
+#
+
+--write_file $MYSQLTEST_VARDIR/tmp/mysqld.$server_id_for_restart.expect
 wait
 EOF
 
@@ -13,7 +25,7 @@ shutdown_server 10;
 --source include/wait_until_disconnected.inc
 
 # Write file to make mysql-test-run.pl start up the server again
---append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--append_file $MYSQLTEST_VARDIR/tmp/mysqld.$server_id_for_restart.expect
 restart
 EOF
 

=== modified file 'mysql-test/suite/falcon/t/disabled.def'
--- a/mysql-test/suite/falcon/t/disabled.def	2008-12-10 16:55:09 +0000
+++ b/mysql-test/suite/falcon/t/disabled.def	2008-12-19 13:10:10 +0000
@@ -11,4 +11,3 @@
 ##############################################################################
 
 falcon_bug_32398 : Bug#32398 2008-08-28 HF HF disabled until new fix for this bug is developed
-falcon_bug_28095 : Bug#40636 2008-12-10 hky Disabled until soft server restart works reliable