diff options
| author | Ingo Struewing <ingo.struewing@oracle.com> | 2010-09-21 16:37:18 +0200 |
|---|---|---|
| committer | Ingo Struewing <ingo.struewing@oracle.com> | 2010-09-21 16:37:18 +0200 |
| commit | b288324a13452a5c8430af6eb560ba1ba4b73746 (patch) | |
| tree | dfdb80f6afcefcdf6e0379231b57426dc075a794 /sql | |
| parent | 0c74cc0d1097c51e9e54c6e0fb1550e4d3df84c7 (diff) | |
| parent | e1418b14ecc1d6c2c2ec28246be0a4a30751ba6f (diff) | |
| download | mariadb-git-b288324a13452a5c8430af6eb560ba1ba4b73746.tar.gz | |
Bug#46339 - crash on REPAIR TABLE merge table USE_FRM
Merge from saved bundle.
Diffstat (limited to 'sql')
| -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 7a7446c7f79..04cc9e42413 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4416,9 +4416,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. */ |