1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE

Browse Source 
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().
This commit is contained in:
unknown 2007-11-18 20:28:37 +01:00
parent c8450b278d
commit 5f4bb8429e
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/merge.result
View File

@ -1875,10 +1875,6 @@ CHECK TABLE t1 EXTENDED;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK
LOCK TABLES t2 WRITE, t1 WRITE; LOCK TABLES t2 WRITE, t1 WRITE;
SELECT * FROM t2;
c1
1
LOCK TABLES t2 WRITE, t1 WRITE;
REPAIR TABLE t1; REPAIR TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair status OK

2
mysql-test/t/merge.test
View File

@ -1279,8 +1279,6 @@ CHECK TABLE t1 EXTENDED;
# #
# Not using FLUSH TABLES before REPAIR. # Not using FLUSH TABLES before REPAIR.
LOCK TABLES t2 WRITE, t1 WRITE; LOCK TABLES t2 WRITE, t1 WRITE;
SELECT * FROM t2;
LOCK TABLES t2 WRITE, t1 WRITE;
REPAIR TABLE t1; REPAIR TABLE t1;
CHECK TABLE t1; CHECK TABLE t1;
REPAIR TABLE t1; REPAIR TABLE t1;

7
sql/sql_trigger.cc
View File

@ -489,8 +489,11 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
/* Under LOCK TABLES we must reopen the table to activate the trigger. */ /* Under LOCK TABLES we must reopen the table to activate the trigger. */
if (!result && thd->locked_tables) if (!result && thd->locked_tables)
{ {
close_data_files_and_morph_locks(thd, table->s->db.str, /*
table->s->table_name.str); Must not use table->s->db.str or table->s->table_name.str here.
The strings are used in a loop even after the share may be freed.
*/
close_data_files_and_morph_locks(thd, tables->db, tables->table_name);
thd->in_lock_tables= 1; thd->in_lock_tables= 1;
result= reopen_tables(thd, 1, 0); result= reopen_tables(thd, 1, 0);
thd->in_lock_tables= 0; thd->in_lock_tables= 0;