summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-12-13 19:57:19 +0200
committerMichael Widenius <monty@askmonty.org>2011-12-13 19:57:19 +0200
commit33c26f78428d30e1ca860803e5e0142ca41f8b61 (patch)
treeb0760b663c4e13c671282ca1e9953f9f17bfd1c7 /mysql-test/std_data
parent6404504d0c10d58ad5861bdb72edd54508f1364c (diff)
downloadmariadb-git-33c26f78428d30e1ca860803e5e0142ca41f8b61.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/std_data')
-rw-r--r--mysql-test/std_data/bug887051.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/std_data/bug887051.txt b/mysql-test/std_data/bug887051.txt
new file mode 100644
index 00000000000..a1df5f35bb1
--- /dev/null
+++ b/mysql-test/std_data/bug887051.txt
@@ -0,0 +1,2 @@
+saved1
+saved2