diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:49:00 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:49:00 +0200 |
| commit | 5d364e53cb8545790e1b5f37489a2180b78a43cc (patch) | |
| tree | 5979d0b008c9d6e39a02c6782e91c44aa89807b7 /sql/discover.cc | |
| parent | a489ae89b9ffe427963745f13c44e1e4d67494f4 (diff) | |
| download | mariadb-git-5d364e53cb8545790e1b5f37489a2180b78a43cc.tar.gz | |
handlerton::discover_table_names() can not discover only
"unknown" tables. Duplicates are possible - deal with them.
Diffstat (limited to 'sql/discover.cc')
| -rw-r--r-- | sql/discover.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/discover.cc b/sql/discover.cc index 82dc8d97d65..e2e84824f4d 100644 --- a/sql/discover.cc +++ b/sql/discover.cc @@ -232,11 +232,10 @@ int extension_based_table_discovery(MY_DIR *dirp, const char *ext_meta, will ignore them. Anyone still having these files, should disable discovering engines, and rename these invalid table files. */ -int ext_table_discovery_simple(MY_DIR *dirp, const char *ext_meta, +int ext_table_discovery_simple(MY_DIR *dirp, handlerton::discovered_list *result) { CHARSET_INFO *cs= character_set_filesystem; - size_t ext_meta_len= strlen(ext_meta); FILEINFO *cur, *end; cur= dirp->dir_entry; @@ -248,7 +247,7 @@ int ext_table_discovery_simple(MY_DIR *dirp, const char *ext_meta, if (ext && !is_prefix(cur->name, tmp_file_prefix)) { if (my_strnncoll(cs, (uchar*)ext, strlen(ext), - (uchar*)ext_meta, ext_meta_len) == 0) + (uchar*)reg_ext, reg_ext_length) == 0) { *ext = 0; if (result->add_file(cur->name)) |