diff options
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 99f22993393..bef6209bd98 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1083,7 +1083,7 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd) if (!db || check_db_name(db)) { - net_printf(thd,ER_WRONG_DB_NAME, db ? db : "NULL"); + net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), db ? db : "NULL"); goto err; } if (lower_case_table_names) @@ -1424,7 +1424,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, // null test to handle EOM if (!db || !strip_sp(db) || check_db_name(db)) { - net_printf(thd,ER_WRONG_DB_NAME, db ? db : "NULL"); + net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), db ? db : "NULL"); break; } if (check_access(thd,CREATE_ACL,db,0,1,0)) @@ -1440,7 +1440,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, // null test to handle EOM if (!db || !strip_sp(db) || check_db_name(db)) { - net_printf(thd,ER_WRONG_DB_NAME, db ? db : "NULL"); + net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), db ? db : "NULL"); break; } if (check_access(thd,DROP_ACL,db,0,1,0)) @@ -2026,7 +2026,7 @@ mysql_execute_command(THD *thd) #endif if (strlen(tables->real_name) > NAME_LEN) { - net_printf(thd,ER_WRONG_TABLE_NAME,tables->real_name); + net_printf(thd,ER_WRONG_NAME, ER(ER_TABLE), tables->real_name); break; } LOCK_ACTIVE_MI; @@ -2071,7 +2071,7 @@ mysql_execute_command(THD *thd) #endif if (strlen(tables->real_name) > NAME_LEN) { - net_printf(thd, ER_WRONG_TABLE_NAME, tables->alias); + net_printf(thd, ER_WRONG_NAME, ER(ER_TABLE), tables->alias); res=0; break; } @@ -2203,7 +2203,7 @@ mysql_execute_command(THD *thd) ulong priv=0; if (lex->name && (!lex->name[0] || strlen(lex->name) > NAME_LEN)) { - net_printf(thd,ER_WRONG_TABLE_NAME,lex->name); + net_printf(thd, ER_WRONG_NAME, ER(ER_TABLE), lex->name); res=0; break; } @@ -2777,7 +2777,7 @@ mysql_execute_command(THD *thd) remove_escape(db); // Fix escaped '_' if (check_db_name(db)) { - net_printf(thd,ER_WRONG_DB_NAME, db); + net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), db); goto error; } #ifndef NO_EMBEDDED_ACCESS_CHECKS @@ -2942,7 +2942,7 @@ mysql_execute_command(THD *thd) { if (!strip_sp(lex->name) || check_db_name(lex->name)) { - net_printf(thd,ER_WRONG_DB_NAME, lex->name); + net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), lex->name); break; } /* @@ -2970,7 +2970,7 @@ mysql_execute_command(THD *thd) { if (!strip_sp(lex->name) || check_db_name(lex->name)) { - net_printf(thd,ER_WRONG_DB_NAME, lex->name); + net_printf(thd, ER_WRONG_NAME, ER(ER_DATABASE), lex->name); break; } /* @@ -3003,7 +3003,7 @@ mysql_execute_command(THD *thd) { if (!strip_sp(lex->name) || check_db_name(lex->name)) { - net_printf(thd,ER_WRONG_DB_NAME, lex->name); + net_printf(thd, ER_WRONG_NAME, ER(ER_DATABASE), lex->name); break; } if (check_access(thd,ALTER_ACL,lex->name,0,1,0)) @@ -3020,7 +3020,7 @@ mysql_execute_command(THD *thd) { if (!strip_sp(lex->name) || check_db_name(lex->name)) { - net_printf(thd,ER_WRONG_DB_NAME, lex->name); + net_printf(thd,ER_WRONG_NAME, ER(ER_DATABASE), lex->name); break; } if (check_access(thd,DROP_ACL,lex->name,0,1,0)) @@ -4086,7 +4086,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type, { char *not_used; uint not_used2; - bool not_used3; + bool not_used3; thd->cuted_fields=0; String str,*res; @@ -4116,7 +4116,8 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type, { String str,*res; res=default_value->val_str(&str); - if (!find_enum(interval,res->ptr(),res->length())) + res->strip_sp(); + if (!find_type(interval, res->ptr(), res->length(), 0)) { net_printf(thd,ER_INVALID_DEFAULT,field_name); DBUG_RETURN(1); @@ -4268,7 +4269,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, if (check_table_name(table->table.str,table->table.length) || table->db.str && check_db_name(table->db.str)) { - net_printf(thd,ER_WRONG_TABLE_NAME,table->table.str); + net_printf(thd, ER_WRONG_NAME, ER(ER_TABLE), table->table.str); DBUG_RETURN(0); } @@ -4622,7 +4623,7 @@ static bool append_file_to_dir(THD *thd, char **filename_ptr, char *table_name) if (strlen(*filename_ptr)+strlen(table_name) >= FN_REFLEN-1 || !test_if_hard_path(*filename_ptr)) { - my_error(ER_WRONG_TABLE_NAME, MYF(0), *filename_ptr); + my_error(ER_WRONG_NAME, MYF(0), ER(ER_TABLE), *filename_ptr); return 1; } /* Fix is using unix filename format on dos */ |