diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-10 17:04:09 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-10 17:04:09 +0200 |
| commit | 84edaac4f14b2fbaf57fef8fbaeb45966b1feda3 (patch) | |
| tree | 63051b8c7027a17b6857c32ed31ac0734d8e1a2b /mysql-test/t/archive.test | |
| parent | 1bbb55a2603f3571585cc085f05149d3d9cdbdba (diff) | |
| download | mariadb-git-84edaac4f14b2fbaf57fef8fbaeb45966b1feda3.tar.gz | |
Better warning message if lock test fails
Made archive.test a bit more safe
mysql-test/r/archive.result:
Added removal of files to make rerun of failed test work
mysql-test/t/archive.test:
Added removal of files to make rerun of failed test work
mysys/thr_lock.c:
Better warning message if lock test fails
Diffstat (limited to 'mysql-test/t/archive.test')
| -rw-r--r-- | mysql-test/t/archive.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test index 7478c7dcdce..c966b51d861 100644 --- a/mysql-test/t/archive.test +++ b/mysql-test/t/archive.test @@ -1630,6 +1630,11 @@ SET @@join_buffer_size= @save_join_buffer_size; # BUG#47012 archive tables are not upgradeable, and server crashes on any access # let $MYSQLD_DATADIR= `SELECT @@datadir`; + +# Remove files to handle possible restart of test +flush tables; +remove_files_wildcard $MYSQLD_DATADIR/test t1.*; + copy_file std_data/bug47012.frm $MYSQLD_DATADIR/test/t1.frm; copy_file std_data/bug47012.ARZ $MYSQLD_DATADIR/test/t1.ARZ; copy_file std_data/bug47012.ARM $MYSQLD_DATADIR/test/t1.ARM; |