diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-04 21:37:29 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-04 21:37:29 +0100 |
| commit | 1ef87c5578a3a5d2a6481b7b0dfbca9b0f3d0e48 (patch) | |
| tree | 9a1d5fff2f85b9cab5d80d2982c543365fc427c6 /sql/sql_db.cc | |
| parent | 032a61fc0ac748af272db4f3931d22d48c9e9785 (diff) | |
| download | mariadb-git-1ef87c5578a3a5d2a6481b7b0dfbca9b0f3d0e48.tar.gz | |
MDEV-5080 Assertion `strcmp(share->unique_file_name,filename) || share->last_version' fails at /storage/myisam/mi_open.c:67
extend table names discovery (ha_discover_table_names() and Discovered_table_list) to return
or optionally filter out temporary tables ("#sql..."). SHOW commands and I_S tables
typically want temp table filtered out, while DROP DATABASE wants to see them too.
additonally, remove the supression for the warning "Invalid (old?) table or database name"
from mtr, and add it to .test files as needed (we need to test that this warning
does *not* happen in drop.test)
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 7cc2caaa881..ec7561594c9 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -991,7 +991,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp, /* first, get the list of tables */ Dynamic_array<LEX_STRING*> files(dirp->number_of_files); - Discovered_table_list tl(thd, &files, &null_lex_str); + Discovered_table_list tl(thd, &files); if (ha_discover_table_names(thd, &db, dirp, &tl, true)) DBUG_RETURN(1); |