diff options
author | bell@sanja.is.com.ua <> | 2004-11-13 19:35:51 +0200 |
---|---|---|
committer | bell@sanja.is.com.ua <> | 2004-11-13 19:35:51 +0200 |
commit | 7210195f1e8b482db0a102b921a859604a1f9522 (patch) | |
tree | a534689811d0f65eba423eed77b056f3bb30bd51 /sql/sql_rename.cc | |
parent | 1555469b646733f86692033bb20f500b7be29458 (diff) | |
download | mariadb-git-7210195f1e8b482db0a102b921a859604a1f9522.tar.gz |
now my_printf_error is not better then my_error, but my_error call is shorter
used only one implementation of format parser of (printf)
fixed multistatement
Diffstat (limited to 'sql/sql_rename.cc')
-rw-r--r-- | sql/sql_rename.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index 25874e1335a..9f29a975441 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -157,8 +157,7 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error) unpack_filename(name, name); if (!access(name,F_OK)) { - my_printf_error(ER_TABLE_EXISTS_ERROR, ER(ER_TABLE_EXISTS_ERROR), - MYF(0), new_alias); + my_error(ER_TABLE_EXISTS_ERROR, MYF(0), new_alias); DBUG_RETURN(ren_table); // This can't be skipped } sprintf(name,"%s/%s/%s%s",mysql_data_home, @@ -167,8 +166,7 @@ rename_tables(THD *thd, TABLE_LIST *table_list, bool skip_error) unpack_filename(name, name); if ((table_type=get_table_type(name)) == DB_TYPE_UNKNOWN) { - my_printf_error(ER_FILE_NOT_FOUND, ER(ER_FILE_NOT_FOUND), MYF(0), - name, my_errno); + my_error(ER_FILE_NOT_FOUND, MYF(0), name, my_errno); if (!skip_error) DBUG_RETURN(ren_table); } |