diff options
| author | brian@avenger.(none) <> | 2004-11-11 18:58:57 -0800 |
|---|---|---|
| committer | brian@avenger.(none) <> | 2004-11-11 18:58:57 -0800 |
| commit | f05daf02ba845b820d6a817c9e2058654b4a764b (patch) | |
| tree | 46fde821aa292e663e9f48d37f44657e025a1271 /sql/sql_db.cc | |
| parent | 7073829fbb3515edca83a87dbfd428c88f47a3e0 (diff) | |
| parent | 6f39bf2b9c31f78ef6940dacb81e80d6772640b9 (diff) | |
| download | mariadb-git-f05daf02ba845b820d6a817c9e2058654b4a764b.tar.gz | |
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 7a100d05b93..ad74bb8f833 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -31,11 +31,6 @@ const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NullS}; static TYPELIB deletable_extentions= {array_elements(del_exts)-1,"del_exts", del_exts, NULL}; -const char *known_exts[]= -{".ISM",".ISD",".ISM",".MRG",".MYI",".MYD",".db", ".ibd", NullS}; -static TYPELIB known_extentions= -{array_elements(known_exts)-1,"known_exts", known_exts, NULL}; - static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, const char *path, uint level); @@ -755,7 +750,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, extension= fn_ext(file->name); if (find_type(extension, &deletable_extentions,1+2) <= 0) { - if (find_type(extension, &known_extentions,1+2) <= 0) + if (find_type(extension, ha_known_exts(),1+2) <= 0) found_other_files++; continue; } |