1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix type mismatch. Table names are represented as LEX_STRING

Browse Source 
objects whose length is stored in a size_t type.
This commit is contained in:
Davi Arnaut 2010-05-27 18:28:24 -03:00
parent 3cc56cb5ad
commit a3d61b0bb2
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/log.cc
View File

@ -370,8 +370,8 @@ bool LOGGER::is_log_table_enabled(uint log_table_type)
/* Check if a given table is opened log table */ /* Check if a given table is opened log table */
int check_if_log_table(uint db_len, const char *db, uint table_name_len, int check_if_log_table(size_t db_len, const char *db, size_t table_name_len,
const char *table_name, uint check_if_opened) const char *table_name, bool check_if_opened)
{ {
if (db_len == 5 && if (db_len == 5 &&
!(lower_case_table_names ? !(lower_case_table_names ?

4
sql/log.h
View File

@ -499,8 +499,8 @@ public:
}; };
int check_if_log_table(uint db_len, const char *db, uint table_name_len, int check_if_log_table(size_t db_len, const char *db, size_t table_name_len,
const char *table_name, uint check_if_opened); const char *table_name, bool check_if_opened);
class Log_to_csv_event_handler: public Log_event_handler class Log_to_csv_event_handler: public Log_event_handler
{ {

14
sql/table.cc
View File

@ -2777,9 +2777,10 @@ bool check_db_name(LEX_STRING *org_name)
*/ */
bool check_table_name(const char *name, uint length) bool check_table_name(const char *name, size_t length)
{ {
uint name_length= 0; // name length in symbols // name length in symbols
size_t name_length= 0;
const char *end= name+length; const char *end= name+length;
if (!length || length > NAME_LEN) if (!length || length > NAME_LEN)
return 1; return 1;
@ -2809,16 +2810,17 @@ bool check_table_name(const char *name, uint length)
name_length++; name_length++;
} }
#if defined(USE_MB) && defined(USE_MB_IDENT) #if defined(USE_MB) && defined(USE_MB_IDENT)
return (last_char_is_space || name_length > NAME_CHAR_LEN) ; return last_char_is_space || (name_length > NAME_CHAR_LEN);
#else #else
return 0; return FALSE;
#endif #endif
} }
bool check_column_name(const char *name) bool check_column_name(const char *name)
{ {
uint name_length= 0; // name length in symbols // name length in symbols
size_t name_length= 0;
bool last_char_is_space= TRUE; bool last_char_is_space= TRUE;
while (*name) while (*name)
@ -2845,7 +2847,7 @@ bool check_column_name(const char *name)
name_length++; name_length++;
} }
/* Error if empty or too long column name */ /* Error if empty or too long column name */
return last_char_is_space || (uint) name_length > NAME_CHAR_LEN; return last_char_is_space || (name_length > NAME_CHAR_LEN);
} }

2
sql/table.h
View File

@ -2001,7 +2001,7 @@ void update_create_info_from_table(HA_CREATE_INFO *info, TABLE *form);
bool check_and_convert_db_name(LEX_STRING *db, bool preserve_lettercase); bool check_and_convert_db_name(LEX_STRING *db, bool preserve_lettercase);
bool check_db_name(LEX_STRING *db); bool check_db_name(LEX_STRING *db);
bool check_column_name(const char *name); bool check_column_name(const char *name);
bool check_table_name(const char *name, uint length); bool check_table_name(const char *name, size_t length);
int rename_file_ext(const char * from,const char * to,const char * ext); int rename_file_ext(const char * from,const char * to,const char * ext);
char *get_field(MEM_ROOT *mem, Field *field); char *get_field(MEM_ROOT *mem, Field *field);
bool get_field(MEM_ROOT *mem, Field *field, class String *res); bool get_field(MEM_ROOT *mem, Field *field, class String *res);