database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug #58515 Tests: use use exec echo, not write_file to write mysqld.1.expect

Browse Source 
Fixed as suggested in the .inc file and two tests
Could not reproduce problem, but tested tests on Windows
This commit is contained in:
Bjorn Munch
2010-11-26 13:59:39 +01:00
parent f6c89f46ca
commit 067710eba1
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
View File

@ -53,9 +53,7 @@ source include/wait_for_slave_to_start.inc;
connection master; connection master;
# Write file to make mysql-test-run.pl expect the "crash", but don't start # Write file to make mysql-test-run.pl expect the "crash", but don't start
# it until it's told to # it until it's told to
--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
wait
EOF
# Send shutdown to the connected server and give # Send shutdown to the connected server and give
# it 10 seconds to die before zapping it # it 10 seconds to die before zapping it
@ -85,9 +83,7 @@ source include/wait_for_slave_io_error.inc;
eval set @@global.debug = "-d,$dbug_sync_point"; eval set @@global.debug = "-d,$dbug_sync_point";
# Write file to make mysql-test-run.pl start up the server again # Write file to make mysql-test-run.pl start up the server again
--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
restart
EOF
connection master; connection master;
# Turn on reconnect # Turn on reconnect

8
mysql-test/include/restart_mysqld.inc
View File

@ -1,18 +1,14 @@
# Write file to make mysql-test-run.pl expect the "crash", but don't start # Write file to make mysql-test-run.pl expect the "crash", but don't start
# it until it's told to # it until it's told to
--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
wait
EOF
# Send shutdown to the connected server and give # Send shutdown to the connected server and give
# it 10 seconds to die before zapping it # it 10 seconds to die before zapping it
shutdown_server 10; shutdown_server 10;
# Write file to make mysql-test-run.pl start up the server again # Write file to make mysql-test-run.pl start up the server again
--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
restart
EOF
# Turn on reconnect # Turn on reconnect
--enable_reconnect --enable_reconnect

8
mysql-test/suite/rpl/t/rpl_trigger.test
View File

@ -313,9 +313,7 @@ FLUSH LOGS;
# Stop master server # Stop master server
--echo --> Stop master server --echo --> Stop master server
--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
wait
EOF
--shutdown_server 10 --shutdown_server 10
--source include/wait_until_disconnected.inc --source include/wait_until_disconnected.inc
# Replace binlog # Replace binlog
@ -323,9 +321,7 @@ remove_file $MYSQLD_DATADIR/master-bin.000001;
copy_file $MYSQL_TEST_DIR/std_data/bug16266.000001 $MYSQLD_DATADIR/master-bin.000001; copy_file $MYSQL_TEST_DIR/std_data/bug16266.000001 $MYSQLD_DATADIR/master-bin.000001;
--echo --> Start master server --echo --> Start master server
--append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
restart
EOF
--enable_reconnect --enable_reconnect
--source include/wait_until_connected_again.inc --source include/wait_until_connected_again.inc
let $binlog_version= query_get_value(SHOW BINLOG EVENTS, Info, 1); let $binlog_version= query_get_value(SHOW BINLOG EVENTS, Info, 1);