summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorunknown <istruewing@stella.local>2007-11-18 20:28:37 +0100
committerunknown <istruewing@stella.local>2007-11-18 20:28:37 +0100
commit5f4bb8429e9a883bf77c2a5d42d81d43fea19e3a (patch)
tree436e0d2b3367acd094c89e35dffc784b3e3db7bf /mysql-test/r/merge.result
parentc8450b278d7f049e0afa49624c52e0f61b541126 (diff)
downloadmariadb-git-5f4bb8429e9a883bf77c2a5d42d81d43fea19e3a.tar.gz
Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
corrupts a MERGE table Post-pushbuild fix for a Valgrind warning. mysql-test/r/merge.result: Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table Fixed test result. mysql-test/t/merge.test: Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table Removed unnecessary statements from test. sql/sql_trigger.cc: Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE corrupts a MERGE table Fixed usage of db and table_name for close_data_files_and_morph_locks().
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r--mysql-test/r/merge.result4
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 74441db2512..ba1680f2cac 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -1875,10 +1875,6 @@ CHECK TABLE t1 EXTENDED;
Table Op Msg_type Msg_text
test.t1 check status OK
LOCK TABLES t2 WRITE, t1 WRITE;
-SELECT * FROM t2;
-c1
-1
-LOCK TABLES t2 WRITE, t1 WRITE;
REPAIR TABLE t1;
Table Op Msg_type Msg_text
test.t1 repair status OK