diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-08-25 14:57:57 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-08-25 14:57:57 +0300 |
| commit | 29c44654ffb7ba111140d201e23d0b902d7ae2e3 (patch) | |
| tree | d8a5626cf724fdcc3ca39b31919523af5cda769b /sql/parse_file.cc | |
| parent | e66c75efde264e6630482761e9d871e06320f85c (diff) | |
| download | mariadb-git-29c44654ffb7ba111140d201e23d0b902d7ae2e3.tar.gz | |
removing archive of .frm-s added (BUG#4821)
mysql-test/r/view.result:
Removing database with .frm archives
mysql-test/t/view.test:
Removing database with .frm archives
sql/parse_file.cc:
fixed revision number printing
sql/sql_db.cc:
removing archive of .frm-s added
Diffstat (limited to 'sql/parse_file.cc')
| -rw-r--r-- | sql/parse_file.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc index 231780f437e..729f49dcbbe 100644 --- a/sql/parse_file.cc +++ b/sql/parse_file.cc @@ -269,8 +269,8 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name, } } - my_snprintf(path_to, FN_REFLEN, "%s/%s-%04lld", - path_arc, file_name->str, old_version); + my_snprintf(path_to, FN_REFLEN, "%s/%s-%04lu", + path_arc, file_name->str, (ulong) old_version); if (my_rename(path, path_to, MYF(MY_WME))) { DBUG_RETURN(TRUE); @@ -279,9 +279,9 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name, // remove very old version if (old_version > max_versions) { - my_snprintf(path_to, FN_REFLEN, "%s/%s-%04lld", + my_snprintf(path_to, FN_REFLEN, "%s/%s-%04lu", path_arc, file_name->str, - old_version - max_versions); + (ulong)(old_version - max_versions)); if (!access(path_arc, F_OK) && my_delete(path_to, MYF(MY_WME))) { DBUG_RETURN(TRUE); |