diff options
| author | Ingo Struewing <ingo.struewing@sun.com> | 2010-04-26 15:44:10 +0200 |
|---|---|---|
| committer | Ingo Struewing <ingo.struewing@sun.com> | 2010-04-26 15:44:10 +0200 |
| commit | e1418b14ecc1d6c2c2ec28246be0a4a30751ba6f (patch) | |
| tree | 8aacf324f654252f1a70657abb13341b6c4ea835 /sql/sql_table.cc | |
| parent | 454c003a5c5a31a8d59ba4ab54d3b3a90a609752 (diff) | |
| download | mariadb-git-e1418b14ecc1d6c2c2ec28246be0a4a30751ba6f.tar.gz | |
Bug#46339 - crash on REPAIR TABLE merge table USE_FRM
REPAIR TABLE ... USE_FRM crashed debug servers.
A wrong assert assumed that this operation would not be executed
for MERGE tables.
Removed the assert.
mysql-test/r/merge.result:
Bug#46339 - crash on REPAIR TABLE merge table USE_FRM
Added test result.
mysql-test/t/merge.test:
Bug#46339 - crash on REPAIR TABLE merge table USE_FRM
Added test.
sql/sql_table.cc:
Bug#46339 - crash on REPAIR TABLE merge table USE_FRM
Removed false assert.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index ad72cab664e..78128fae576 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4384,9 +4384,6 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list, pthread_mutex_unlock(&LOCK_open); } - /* A MERGE table must not come here. */ - DBUG_ASSERT(!table->child_l); - /* REPAIR TABLE ... USE_FRM for temporary tables makes little sense. */ |