diff options
author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-01-18 12:25:07 +0100 |
---|---|---|
committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-01-18 12:25:07 +0100 |
commit | 00a6d119ea0f8fa894c24096b9ed96eb3fbe50cd (patch) | |
tree | ec56466b2f47ca723edf81372c1966f9ffa2b850 /mysql-test/include/rpl_stop_server.inc | |
parent | 96adf25850ca3a84ea0b307a19ace58244bf1a7b (diff) | |
download | mariadb-git-00a6d119ea0f8fa894c24096b9ed96eb3fbe50cd.tar.gz |
Bug #59063 rpl_migration_crash_safe fails on Windows
Undoing the patch, it complicates the code but is not the solution
I do not beleive newline mismatch could be the cause of this failure
First, I cannot see how this could be a problem, mtr ignores the newline
when reading the expect file, and the file is written and read on Windows.
Second, if this really was the problem it should have been deterministic:
either the newline is correctly interepreted or it is not.
Diffstat (limited to 'mysql-test/include/rpl_stop_server.inc')
-rw-r--r-- | mysql-test/include/rpl_stop_server.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/include/rpl_stop_server.inc b/mysql-test/include/rpl_stop_server.inc index a90981d6de8..e1f8839dd69 100644 --- a/mysql-test/include/rpl_stop_server.inc +++ b/mysql-test/include/rpl_stop_server.inc @@ -44,9 +44,7 @@ if ($rpl_debug) # Write file to make mysql-test-run.pl expect the "crash", but don't start # it until it's told to ---append_file $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect -wait -EOF +--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect # Send shutdown to the connected server and give # it 10 seconds to die before zapping it |