Merge pilot:mysql/mysql-5.1-rpl

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-rpl

mysql-test/include/check-testcase.test

@@ -13,7 +13,7 @@
 show global variables where Variable_name != 'timestamp';
 
 # Dump all databases, there should be none
-# except mysql, test and information_schema
+# except those that was created during bootstrap
 show databases;
 
 # The test database should not contain any tables

mysql-test/include/restart_mysqld.inc

@@ -0,0 +1,15 @@
+
+# Write file to make mysql-test-run.pl expect crash and restart
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+
+--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/my.cnf shutdown
+
+# Call script that will poll the server waiting for it to be gone
+--source include/wait_until_disconnected.inc
+
+# Turn on reconnect
+--enable_reconnect
+
+# Call script that will poll the server waiting for it to be back online again
+--source include/wait_until_connected_again.inc
+

mysql-test/include/wait_until_disconnected.inc

@@ -0,0 +1,21 @@
+#
+# Include this script to wait until the connection to the
+# server has been dropped
+--disable_result_log
+--disable_query_log
+let $counter= 500;
+let $mysql_errno= 9999;
+while (!$mysql_errno)
+{
+  --error 0,2002,2006
+  show status;
+
+  dec $counter;
+  if (!$counter)
+  {
+    --die Server failed to dissapear
+  }
+  --sleep 0.1
+}
+--enable_query_log
+--enable_result_log