diff options
| author | bell@sanja.is.com.ua <> | 2004-11-12 14:34:00 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-11-12 14:34:00 +0200 |
| commit | 31f7811183b6dd197cb7643abbe1b56cec72b602 (patch) | |
| tree | 7591e416fa1685ed1e41707824091a5ca7f9c2c1 /sql/parse_file.cc | |
| parent | 5bf7a8c30b7fb3c21a8cd57b4dad9b05b2a3b521 (diff) | |
| download | mariadb-git-31f7811183b6dd197cb7643abbe1b56cec72b602.tar.gz | |
post-review fixes
Diffstat (limited to 'sql/parse_file.cc')
| -rw-r--r-- | sql/parse_file.cc | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc index f548c16d808..61b5b301503 100644 --- a/sql/parse_file.cc +++ b/sql/parse_file.cc @@ -350,7 +350,8 @@ sql_parse_prepare(const LEX_STRING *file_name, MEM_ROOT *mem_root, if (stat_info.st_size > INT_MAX-1) { - my_error(ER_FPARSER_TOO_BIG_FILE, MYF(0), file_name->str); + my_printf_error(ER_FPARSER_TOO_BIG_FILE, + ER(ER_FPARSER_TOO_BIG_FILE), MYF(0), file_name->str); DBUG_RETURN(0); } @@ -412,7 +413,8 @@ sql_parse_prepare(const LEX_STRING *file_name, MEM_ROOT *mem_root, frm_error: if (bad_format_errors) { - my_error(ER_FPARSER_BAD_HEADER, MYF(0), file_name->str); + my_printf_error(ER_FPARSER_BAD_HEADER, ER(ER_FPARSER_BAD_HEADER), MYF(0), + file_name->str); DBUG_RETURN(0); } else @@ -627,7 +629,8 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, // it is comment if (!(ptr= strchr(ptr, '\n'))) { - my_error(ER_FPARSER_EOF_IN_COMMENT, MYF(0), line); + my_printf_error(ER_FPARSER_EOF_IN_COMMENT, + ER(ER_FPARSER_EOF_IN_COMMENT), MYF(0), line); DBUG_RETURN(TRUE); } ptr++; @@ -669,8 +672,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, (LEX_STRING *)(base + parameter->offset)))) { - my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0), - parameter->name.str, line); + my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER, + ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0), + parameter->name.str, line); DBUG_RETURN(TRUE); } break; @@ -681,8 +685,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, (LEX_STRING *) (base + parameter->offset)))) { - my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0), - parameter->name.str, line); + my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER, + ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0), + parameter->name.str, line); DBUG_RETURN(TRUE); } break; @@ -691,8 +696,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, case FILE_OPTIONS_REV: if (!(eol= strchr(ptr, '\n'))) { - my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0), - parameter->name.str, line); + my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER, + ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0), + parameter->name.str, line); DBUG_RETURN(TRUE); } { @@ -709,8 +715,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, /* yyyy-mm-dd HH:MM:SS = 19(PARSE_FILE_TIMESTAMPLENGTH) characters */ if (ptr[PARSE_FILE_TIMESTAMPLENGTH] != '\n') { - my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0), - parameter->name.str, line); + my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER, + ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0), + parameter->name.str, line); DBUG_RETURN(TRUE); } memcpy(val->str, ptr, PARSE_FILE_TIMESTAMPLENGTH); @@ -763,8 +770,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, break; list_err_w_message: - my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0), - parameter->name.str, line); + my_printf_error(ER_FPARSER_ERROR_IN_PARAMETER, + ER(ER_FPARSER_ERROR_IN_PARAMETER), MYF(0), + parameter->name.str, line); list_err: if (change_mem) my_pthread_setspecific_ptr(THR_MALLOC, sql_mem); @@ -779,8 +787,9 @@ File_parser::parse(gptr base, MEM_ROOT *mem_root, // skip unknown parameter if (!(ptr= strchr(ptr, '\n'))) { - my_error(ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER, MYF(0), - line); + my_printf_error(ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER, + ER(ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER), MYF(0), + line); DBUG_RETURN(TRUE); } ptr++; |