summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/t
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-11-29 08:50:54 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2011-11-29 08:50:54 +0100
commit389acf0a30415c745d2c241e1584b0b637ab95ed (patch)
tree8ea69501ccdb171458d1f82ba78c157258a90f71 /mysql-test/suite/innodb/t
parent82adfe7b2a695fd9357e1f2f04415fd1691956b8 (diff)
downloadmariadb-git-389acf0a30415c745d2c241e1584b0b637ab95ed.tar.gz
Fix testcases:
1. main.merge fails with errno 13 in copy_file(). The reason for the error is that copy_file tries to create a file with the same name as recently deleted one, and there is still an open handle for the deleted file. To fix, use my_delete_allow_opened() for MTR's delete_file. On Windows, this renames file to unique name prior to deletion, and prevents EACCES errors for files opened with FILE_SHARE_DELETE. 2. innodb_bug59641 generates warnings, after server was killed and restarted in the test case. The warnings are about test_suppression table (needs to be repaired, as it that was written just prior to the crash) Fixed by using FLUSH TABLES after populating warning suppression table.
Diffstat (limited to 'mysql-test/suite/innodb/t')
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug59641.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug59641.test b/mysql-test/suite/innodb/t/innodb_bug59641.test
index e19dec54bc2..22cd4e49753 100644
--- a/mysql-test/suite/innodb/t/innodb_bug59641.test
+++ b/mysql-test/suite/innodb/t/innodb_bug59641.test
@@ -33,7 +33,7 @@ XA PREPARE '789';
# The server would issue this warning on restart.
call mtr.add_suppression("Found 3 prepared XA transactions");
-
+FLUSH TABLES;
# Kill the server without sending a shutdown command
-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
-- shutdown_server 0