@@ -5208,9 +5208,9 @@ bool check_db_name(LEX_STRING *org_name)
5208
5208
{
5209
5209
char *name= org_name->str ;
5210
5210
size_t name_length= org_name->length ;
5211
- bool check_for_path_chars ;
5211
+ bool disallow_path_chars ;
5212
5212
5213
- if ((check_for_path_chars = check_mysql50_prefix (name)))
5213
+ if ((disallow_path_chars = check_mysql50_prefix (name)))
5214
5214
{
5215
5215
name+= MYSQL50_TABLE_NAME_PREFIX_LENGTH;
5216
5216
name_length-= MYSQL50_TABLE_NAME_PREFIX_LENGTH;
@@ -5222,13 +5222,13 @@ bool check_db_name(LEX_STRING *org_name)
5222
5222
if (lower_case_table_names == 1 && name != any_db.str )
5223
5223
{
5224
5224
org_name->length = name_length= my_casedn_str (files_charset_info, name);
5225
- if (check_for_path_chars )
5225
+ if (disallow_path_chars )
5226
5226
org_name->length += MYSQL50_TABLE_NAME_PREFIX_LENGTH;
5227
5227
}
5228
5228
if (db_name_is_in_ignore_db_dirs_list (name))
5229
5229
return 1 ;
5230
5230
5231
- return check_table_name (name, name_length, check_for_path_chars );
5231
+ return check_table_name (name, name_length, disallow_path_chars );
5232
5232
}
5233
5233
5234
5234
@@ -5238,14 +5238,14 @@ bool check_db_name(LEX_STRING *org_name)
5238
5238
returns 1 on error
5239
5239
*/
5240
5240
5241
- bool check_table_name (const char *name, size_t length, bool check_for_path_chars )
5241
+ bool check_table_name (const char *name, size_t length, bool disallow_path_chars )
5242
5242
{
5243
5243
// name length in symbols
5244
- size_t name_length = 0 ;
5244
+ size_t char_length = 0 ;
5245
5245
const char *end= name+length;
5246
5246
5247
- if (!check_for_path_chars &&
5248
- (check_for_path_chars = check_mysql50_prefix (name)))
5247
+ if (!disallow_path_chars &&
5248
+ (disallow_path_chars = check_mysql50_prefix (name)))
5249
5249
{
5250
5250
name+= MYSQL50_TABLE_NAME_PREFIX_LENGTH;
5251
5251
length-= MYSQL50_TABLE_NAME_PREFIX_LENGTH;
@@ -5260,7 +5260,7 @@ bool check_table_name(const char *name, size_t length, bool check_for_path_chars
5260
5260
return 1 ;
5261
5261
#endif
5262
5262
5263
- while ( name != end)
5263
+ for ( ; name != end ; char_length++ )
5264
5264
{
5265
5265
#if defined(USE_MB) && defined(USE_MB_IDENT)
5266
5266
last_char_is_space= my_isspace (system_charset_info, *name);
@@ -5270,12 +5270,11 @@ bool check_table_name(const char *name, size_t length, bool check_for_path_chars
5270
5270
if (len)
5271
5271
{
5272
5272
name+= len;
5273
- name_length++;
5274
5273
continue ;
5275
5274
}
5276
5275
}
5277
5276
#endif
5278
- if (check_for_path_chars &&
5277
+ if (disallow_path_chars &&
5279
5278
(*name == ' /' || *name == ' \\ ' || *name == ' ~' || *name == FN_EXTCHAR))
5280
5279
return 1 ;
5281
5280
/*
@@ -5294,10 +5293,9 @@ bool check_table_name(const char *name, size_t length, bool check_for_path_chars
5294
5293
if (*name == 0x00 )
5295
5294
return 1 ;
5296
5295
name++;
5297
- name_length++;
5298
5296
}
5299
5297
#if defined(USE_MB) && defined(USE_MB_IDENT)
5300
- return last_char_is_space || (name_length > NAME_CHAR_LEN);
5298
+ return last_char_is_space || (char_length > NAME_CHAR_LEN);
5301
5299
#else
5302
5300
return FALSE ;
5303
5301
#endif
0 commit comments