bzr commit into mysql-5.1-telco-7.1 branch (Martin.Skold:4018)

[Martin Skold]

#At file:///home/marty/MySQL/mysql-5.1-telco-7.1_dist-priv/

 4018 Martin Skold	2010-12-20
      Reverted extension for mysqld options
      modified:
        mysql-test/include/restart_mysqld.inc

=== modified file 'mysql-test/include/restart_mysqld.inc'
--- a/mysql-test/include/restart_mysqld.inc	2010-12-15 10:40:24 +0000
+++ b/mysql-test/include/restart_mysqld.inc	2010-12-20 11:18:22 +0000
@@ -15,11 +15,9 @@ shutdown_server 10;
 
 # Write file to make mysql-test-run.pl start up the server again
 --append_file $MYSQLTEST_VARDIR/tmp/$mysqld_name.expect
-restart $mysqld_options
+restart
 EOF
 
-let $mysqld_options=
-
 # Turn on reconnect
 --enable_reconnect