diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-13 19:57:19 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-13 19:57:19 +0200 |
| commit | b7de2b3184cd84929291babaa45b6bda4965dd9b (patch) | |
| tree | b0760b663c4e13c671282ca1e9953f9f17bfd1c7 /mysql-test/suite/maria/t | |
| parent | f50cd8e50d9bc980d589a435d9cd79c0ef439261 (diff) | |
| download | mariadb-git-b7de2b3184cd84929291babaa45b6bda4965dd9b.tar.gz | |
Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETE
mysql-test/suite/maria/r/maria-recovery3.result:
Added test case for recovery bug
mysql-test/suite/maria/t/maria-recovery3.test:
Added test case for recovery bug
storage/maria/ha_maria.cc:
Don't print query twice to log
storage/maria/ma_delete.c:
More DBUG_PRINT
storage/maria/ma_key_recover.c:
Added new asserts to detect errors earlier
storage/maria/ma_recovery.c:
Update all states when moving a non-transactional file to transactional. This fixes lp:887051
Diffstat (limited to 'mysql-test/suite/maria/t')
| -rw-r--r-- | mysql-test/suite/maria/t/maria-recovery3.test | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/suite/maria/t/maria-recovery3.test b/mysql-test/suite/maria/t/maria-recovery3.test index 192361633ca..c8333a66f30 100644 --- a/mysql-test/suite/maria/t/maria-recovery3.test +++ b/mysql-test/suite/maria/t/maria-recovery3.test @@ -109,6 +109,24 @@ truncate table t1; check table t1 extended; drop table t1; +# +# Test for BUG#887051; Failure in recovery with delete +# + +let $mvr_restore_old_snapshot=0; +let $mms_compare_physically=0; +let $mvr_debug_option="+d,maria_flush_whole_log,maria_crash"; +let $mvr_crash_statement= set global aria_checkpoint_interval=1; +CREATE TABLE t1 ( word VARCHAR(255) PRIMARY KEY ) ENGINE=Aria; +LOAD DATA INFILE '../../std_data/bug887051.txt' INTO TABLE t1; +SET AUTOCOMMIT=0; +DELETE FROM t1; +LOAD DATA INFILE '../../std_data/bug887051.txt' INTO TABLE t1 IGNORE 1 LINES; +COMMIT; +-- source include/maria_verify_recovery.inc +select * from t1; +drop table t1; + # clean up everything let $mms_purpose=feeding_recovery; eval drop database mysqltest_for_$mms_purpose; |