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_load.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_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 4f5cf463fb6..d9e4943f322 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -125,8 +125,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, DBUG_RETURN(-1); if (!table_list->updatable || check_key_in_view(thd, table_list)) { - my_printf_error(ER_NON_UPDATABLE_TABLE, ER(ER_NON_UPDATABLE_TABLE), - MYF(0), table_list->alias, "LOAD"); + my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "LOAD"); DBUG_RETURN(TRUE); } table= table_list->table; @@ -149,8 +148,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, DBUG_RETURN(TRUE); if (thd->dupp_field) { - my_printf_error(ER_FIELD_SPECIFIED_TWICE, ER(ER_FIELD_SPECIFIED_TWICE), - MYF(0), thd->dupp_field->field_name); + my_error(ER_FIELD_SPECIFIED_TWICE, MYF(0), thd->dupp_field->field_name); DBUG_RETURN(TRUE); } if (check_that_all_fields_are_given_values(thd, table)) @@ -223,8 +221,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, ((stat_info.st_mode & S_IFREG) == S_IFREG || (stat_info.st_mode & S_IFIFO) == S_IFIFO))) { - my_printf_error(ER_TEXTFILE_NOT_READABLE, - ER(ER_TEXTFILE_NOT_READABLE), MYF(0), name); + my_error(ER_TEXTFILE_NOT_READABLE, MYF(0), name); DBUG_RETURN(TRUE); } if ((stat_info.st_mode & S_IFIFO) == S_IFIFO) |