Skip to content

Commit bf5cc31

Browse files
vuvovavuvova
committed
cleanup: cosmetic changes
1 parent 6540530 commit bf5cc31

File tree

2 files changed

+58
-94
lines changed

2 files changed

+58
-94
lines changed

‎sql/item.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@ int Item::save_in_field_no_warnings(Field *field, bool no_conversions)
15041504

15051505
#ifndef DBUG_OFF
15061506
static inline
1507-
void mark_unsupported_func(const char *where, const char *processor_name)
1507+
void dbug_mark_unsupported_func(const char *where, const char *processor_name)
15081508
{
15091509
char buff[64];
15101510
my_snprintf(buff, sizeof(buff), "%s::%s", where ? where: "", processor_name);
@@ -1514,15 +1514,15 @@ void mark_unsupported_func(const char *where, const char *processor_name)
15141514
DBUG_VOID_RETURN;
15151515
}
15161516
#else
1517-
#define mark_unsupported_func(X,Y) {}
1517+
#define dbug_mark_unsupported_func(X,Y) {}
15181518
#endif
15191519

15201520
bool mark_unsupported_function(const char *where, void *store, uint result)
15211521
{
15221522
Item::vcol_func_processor_result *res=
15231523
(Item::vcol_func_processor_result*) store;
15241524
uint old_errors= res->errors;
1525-
mark_unsupported_func(where, "check_vcol_func_processor");
1525+
dbug_mark_unsupported_func(where, "check_vcol_func_processor");
15261526
res->errors|= result; /* Store type of expression */
15271527
/* Store the name to the highest violation (normally VCOL_IMPOSSIBLE) */
15281528
if (result > old_errors)

‎sql/sql_table.cc

Lines changed: 55 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ static int copy_data_between_tables(THD *, TABLE *,TABLE *,
7777
ha_rows *, ha_rows *,
7878
Alter_info::enum_enable_or_disable,
7979
Alter_table_ctx *);
80-
static int append_system_key_parts(THD *thd, HA_CREATE_INFO *create_info,
81-
Key *key);
80+
static int append_system_key_parts(THD *, HA_CREATE_INFO *, Key *);
8281
static int mysql_prepare_create_table(THD *, HA_CREATE_INFO *, Alter_info *,
8382
uint *, handler *, KEY **, uint *, int,
8483
const LEX_CSTRING db,
@@ -396,8 +395,7 @@ uint filename_to_tablename(const char *from, char *to, size_t to_length,
396395
system_charset_info, to, to_length, &errors);
397396
if (unlikely(errors)) // Old 5.0 name
398397
{
399-
res= (strxnmov(to, to_length, MYSQL50_TABLE_NAME_PREFIX, from, NullS) -
400-
to);
398+
res= strxnmov(to, to_length, MYSQL50_TABLE_NAME_PREFIX, from, NullS) - to;
401399
if (!stay_quiet)
402400
sql_print_error("Invalid (old?) table or database name '%s'", from);
403401
}
@@ -3578,6 +3576,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
35783576
const Column_derived_attributes dattr(create_info->default_table_charset);
35793577
const Column_bulk_alter_attributes
35803578
battr(create_info->alter_table_convert_to_charset);
3579+
const CHARSET_INFO *scs= system_charset_info;
35813580
DBUG_ENTER("mysql_prepare_create_table");
35823581

35833582
DBUG_EXECUTE_IF("test_pseudo_invisible",{
@@ -3591,23 +3590,17 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
35913590
new (thd->mem_root)Item_int(thd, 9));
35923591
});
35933592
DBUG_EXECUTE_IF("test_invisible_index",{
3594-
LEX_CSTRING temp;
3595-
temp.str= "invisible";
3596-
temp.length= strlen("invisible");
3597-
mysql_add_invisible_index(thd, &alter_info->key_list
3598-
, &temp, Key::MULTIPLE);
3593+
LEX_CSTRING temp= { STRING_WITH_LEN("invisible") };
3594+
mysql_add_invisible_index(thd, &alter_info->key_list, &temp,
3595+
Key::MULTIPLE);
35993596
});
3600-
LEX_CSTRING* connect_string = &create_info->connect_string;
3601-
if (connect_string->length != 0 &&
3602-
connect_string->length > CONNECT_STRING_MAXLEN &&
3603-
(system_charset_info->charpos(connect_string->str,
3604-
(connect_string->str +
3605-
connect_string->length),
3606-
CONNECT_STRING_MAXLEN)
3607-
< connect_string->length))
3608-
{
3609-
my_error(ER_WRONG_STRING_LENGTH, MYF(0),
3610-
connect_string->str, "CONNECTION", CONNECT_STRING_MAXLEN);
3597+
LEX_CSTRING* connstr = &create_info->connect_string;
3598+
if (connstr->length > CONNECT_STRING_MAXLEN &&
3599+
scs->charpos(connstr->str, connstr->str + connstr->length,
3600+
CONNECT_STRING_MAXLEN) < connstr->length)
3601+
{
3602+
my_error(ER_WRONG_STRING_LENGTH, MYF(0), connstr->str, "CONNECTION",
3603+
CONNECT_STRING_MAXLEN);
36113604
DBUG_RETURN(TRUE);
36123605
}
36133606

@@ -3670,9 +3663,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
36703663
/* Check if we have used the same field name before */
36713664
for (dup_no=0; (dup_field=it2++) != sql_field; dup_no++)
36723665
{
3673-
if (lex_string_cmp(system_charset_info,
3674-
&sql_field->field_name,
3675-
&dup_field->field_name) == 0)
3666+
if (lex_string_cmp(scs, &sql_field->field_name, &dup_field->field_name) == 0)
36763667
{
36773668
/*
36783669
If this was a CREATE ... SELECT statement, accept a field
@@ -3852,7 +3843,6 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
38523843
key2->name.str != ignore_key &&
38533844
!foreign_key_prefix(key, key2)))
38543845
{
3855-
/* TODO: issue warning message */
38563846
/* mark that the generated key should be ignored */
38573847
if (!key2->generated ||
38583848
(key->generated && key->columns.elements <
@@ -3873,13 +3863,13 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
38733863
else
38743864
(*key_count)--;
38753865
if (key->name.str && !tmp_table && (key->type != Key::PRIMARY) &&
3876-
!my_strcasecmp(system_charset_info, key->name.str, primary_key_name))
3866+
!my_strcasecmp(scs, key->name.str, primary_key_name))
38773867
{
38783868
my_error(ER_WRONG_NAME_FOR_INDEX, MYF(0), key->name.str);
38793869
DBUG_RETURN(TRUE);
38803870
}
38813871
if (key->type == Key::PRIMARY && key->name.str &&
3882-
my_strcasecmp(system_charset_info, key->name.str, primary_key_name) != 0)
3872+
my_strcasecmp(scs, key->name.str, primary_key_name) != 0)
38833873
{
38843874
bool sav_abort_on_warning= thd->abort_on_warning;
38853875
thd->abort_on_warning= FALSE; /* Don't make an error out of this. */
@@ -3917,9 +3907,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
39173907
auto field_name= key->columns.elem(0)->field_name;
39183908
it.rewind();
39193909
while ((sql_field=it++) &&
3920-
lex_string_cmp(system_charset_info,
3921-
&field_name,
3922-
&sql_field->field_name));
3910+
lex_string_cmp(scs, &field_name, &sql_field->field_name));
39233911
if (sql_field)
39243912
field_name= sql_field->field_name;
39253913
key_name=make_unique_key_name(thd, field_name.str,
@@ -4092,9 +4080,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
40924080
it.rewind();
40934081
field=0;
40944082
while ((sql_field=it++) &&
4095-
lex_string_cmp(system_charset_info,
4096-
&column->field_name,
4097-
&sql_field->field_name))
4083+
lex_string_cmp(scs, &column->field_name, &sql_field->field_name))
40984084
field++;
40994085
/*
41004086
Either field is not present or field visibility is > INVISIBLE_USER
@@ -4114,8 +4100,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
41144100
}
41154101
while ((dup_column= cols2++) != column)
41164102
{
4117-
if (!lex_string_cmp(system_charset_info,
4118-
&column->field_name, &dup_column->field_name))
4103+
if (!lex_string_cmp(scs, &column->field_name, &dup_column->field_name))
41194104
{
41204105
my_error(ER_DUP_FIELDNAME, MYF(0), column->field_name.str);
41214106
DBUG_RETURN(TRUE);
@@ -4418,8 +4403,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
44184403
{
44194404
for (Key_part_spec& kp2: fk->columns)
44204405
{
4421-
if (!lex_string_cmp(system_charset_info, &kp.field_name,
4422-
&kp2.field_name))
4406+
if (!lex_string_cmp(scs, &kp.field_name, &kp2.field_name))
44234407
{
44244408
goto without_overlaps_err;
44254409
}
@@ -4530,28 +4514,28 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
45304514
if (create_simple)
45314515
{
45324516
/*
4533-
NOTE: we cannot do this in check_vcol_func_processor() as there is already
4534-
no table name qualifier in expression.
4517+
NOTE: we cannot do this in check_vcol_func_processor() as there is
4518+
already no table name qualifier in expression.
45354519
*/
45364520
if (sql_field->vcol_info && sql_field->vcol_info->expr &&
45374521
sql_field->vcol_info->expr->walk(&Item::check_table_name_processor,
4538-
false, (void *) &walk_prm))
4522+
false, &walk_prm))
45394523
{
45404524
my_error(ER_BAD_FIELD_ERROR, MYF(0), walk_prm.field.c_ptr(), "GENERATED ALWAYS");
45414525
DBUG_RETURN(TRUE);
45424526
}
45434527

45444528
if (sql_field->default_value &&
45454529
sql_field->default_value->expr->walk(&Item::check_table_name_processor,
4546-
false, (void *) &walk_prm))
4530+
false, &walk_prm))
45474531
{
45484532
my_error(ER_BAD_FIELD_ERROR, MYF(0), walk_prm.field.c_ptr(), "DEFAULT");
45494533
DBUG_RETURN(TRUE);
45504534
}
45514535

45524536
if (sql_field->check_constraint &&
45534537
sql_field->check_constraint->expr->walk(&Item::check_table_name_processor,
4554-
false, (void *) &walk_prm))
4538+
false, &walk_prm))
45554539
{
45564540
my_error(ER_BAD_FIELD_ERROR, MYF(0), walk_prm.field.c_ptr(), "CHECK");
45574541
DBUG_RETURN(TRUE);
@@ -4563,65 +4547,51 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
45634547
create_info->check_constraint_list= &alter_info->check_constraint_list;
45644548
{
45654549
List_iterator_fast<Virtual_column_info> c_it(alter_info->check_constraint_list);
4566-
Virtual_column_info *check;
4567-
while ((check= c_it++))
4550+
while (Virtual_column_info *check= c_it++)
45684551
{
4569-
if (create_simple && check->expr->walk(&Item::check_table_name_processor, false,
4570-
(void *) &walk_prm))
4552+
if (create_simple && check->expr->walk(&Item::check_table_name_processor,
4553+
false, &walk_prm))
45714554
{
45724555
my_error(ER_BAD_FIELD_ERROR, MYF(0), walk_prm.field.c_ptr(), "CHECK");
45734556
DBUG_RETURN(TRUE);
45744557
}
4575-
if (!check->name.length || check->automatic_name)
4576-
{
4577-
if (check_expression(check, &check->name, VCOL_CHECK_TABLE, alter_info))
4578-
DBUG_RETURN(TRUE);
4579-
continue;
4580-
}
4581-
4558+
if (check->name.length && !check->automatic_name)
45824559
{
45834560
/* Check that there's no repeating table CHECK constraint names. */
45844561
List_iterator_fast<Virtual_column_info>
45854562
dup_it(alter_info->check_constraint_list);
45864563
const Virtual_column_info *dup_check;
45874564
while ((dup_check= dup_it++) && dup_check != check)
45884565
{
4589-
if (!lex_string_cmp(system_charset_info,
4590-
&check->name, &dup_check->name))
4566+
if (check->name.streq(dup_check->name))
45914567
{
45924568
my_error(ER_DUP_CONSTRAINT_NAME, MYF(0), "CHECK", check->name.str);
45934569
DBUG_RETURN(TRUE);
45944570
}
45954571
}
4596-
}
45974572

4598-
/* Check that there's no repeating key constraint names. */
4599-
List_iterator_fast<Key> key_it(alter_info->key_list);
4600-
while (const Key *key= key_it++)
4601-
{
4602-
/*
4603-
Not all keys considered to be the CONSTRAINT
4604-
Noly Primary Key UNIQUE and Foreign keys.
4605-
*/
4606-
if (key->type != Key::PRIMARY && key->type != Key::UNIQUE &&
4607-
key->type != Key::FOREIGN_KEY)
4608-
continue;
4573+
/* Check that there's no repeating key constraint names. */
4574+
List_iterator_fast<Key> key_it(alter_info->key_list);
4575+
while (const Key *key= key_it++)
4576+
{
4577+
if (key->type != Key::PRIMARY && key->type != Key::UNIQUE &&
4578+
key->type != Key::FOREIGN_KEY)
4579+
continue;
46094580

4610-
if (check->name.length == key->name.length &&
4611-
my_strcasecmp(system_charset_info,
4612-
check->name.str, key->name.str) == 0)
4581+
if (check->name.length == key->name.length &&
4582+
my_strcasecmp(scs, check->name.str, key->name.str) == 0)
4583+
{
4584+
my_error(ER_DUP_CONSTRAINT_NAME, MYF(0), "CHECK", check->name.str);
4585+
DBUG_RETURN(TRUE);
4586+
}
4587+
}
4588+
4589+
if (check_string_char_length(&check->name, 0, NAME_CHAR_LEN, scs, 1))
46134590
{
4614-
my_error(ER_DUP_CONSTRAINT_NAME, MYF(0), "CHECK", check->name.str);
4591+
my_error(ER_TOO_LONG_IDENT, MYF(0), check->name.str);
46154592
DBUG_RETURN(TRUE);
46164593
}
46174594
}
4618-
4619-
if (check_string_char_length(&check->name, 0, NAME_CHAR_LEN,
4620-
system_charset_info, 1))
4621-
{
4622-
my_error(ER_TOO_LONG_IDENT, MYF(0), check->name.str);
4623-
DBUG_RETURN(TRUE);
4624-
}
46254595
if (check_expression(check, &check->name, VCOL_CHECK_TABLE, alter_info))
46264596
DBUG_RETURN(TRUE);
46274597
}
@@ -4644,12 +4614,10 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
46444614
thd->mem_root))
46454615
DBUG_RETURN(TRUE);
46464616

4647-
#ifndef DBUG_OFF
46484617
DBUG_EXECUTE_IF("key",
46494618
Debug_key::print_keys(thd, "prep_create_table: ",
46504619
*key_info_buffer, *key_count);
46514620
);
4652-
#endif
46534621

46544622
DBUG_RETURN(FALSE);
46554623
}
@@ -7736,10 +7704,8 @@ static void update_altered_table(const Alter_inplace_info &ha_alter_info,
77367704
@retval false success
77377705
*/
77387706

7739-
bool mysql_compare_tables(TABLE *table,
7740-
Alter_info *alter_info,
7741-
HA_CREATE_INFO *create_info,
7742-
bool *metadata_equal)
7707+
bool mysql_compare_tables(TABLE *table, Alter_info *alter_info,
7708+
HA_CREATE_INFO *create_info, bool *metadata_equal)
77437709
{
77447710
DBUG_ENTER("mysql_compare_tables");
77457711

@@ -7764,15 +7730,14 @@ bool mysql_compare_tables(TABLE *table,
77647730
Alter_info tmp_alter_info(*alter_info, thd->mem_root);
77657731
uint db_options= 0; /* not used */
77667732
KEY *key_info_buffer= NULL;
7767-
LEX_CSTRING db= { table->s->db.str, table->s->db.length };
7768-
LEX_CSTRING table_name= { table->s->db.str, table->s->table_name.length };
77697733

77707734
/* Create the prepared information. */
77717735
int create_table_mode= table->s->tmp_table == NO_TMP_TABLE ?
77727736
C_ORDINARY_CREATE : C_ALTER_TABLE;
77737737
if (mysql_prepare_create_table(thd, create_info, &tmp_alter_info,
77747738
&db_options, table->file, &key_info_buffer,
7775-
&key_count, create_table_mode, db, table_name))
7739+
&key_count, create_table_mode,
7740+
table->s->db, table->s->table_name))
77767741
DBUG_RETURN(1);
77777742

77787743
/* Some very basic checks. */
@@ -9205,7 +9170,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
92059170
tmp_name.length= strlen(key_name);
92069171
/* We dont need LONG_UNIQUE_HASH_FIELD flag because it will be autogenerated */
92079172
key= new (thd->mem_root) Key(key_type, &tmp_name, &key_create_info,
9208-
MY_TEST(key_info->flags & HA_GENERATED_KEY),
9173+
key_info->flags & HA_GENERATED_KEY,
92099174
&key_parts, key_info->option_list, DDL_options());
92109175
key->without_overlaps= key_info->without_overlaps;
92119176
key->period= table->s->period.name;
@@ -10798,10 +10763,9 @@ do_continue:;
1079810763
*/
1079910764
error= create_table_impl(thd, alter_ctx.db, alter_ctx.table_name,
1080010765
alter_ctx.new_db, alter_ctx.tmp_name,
10801-
alter_ctx.get_tmp_path(),
10802-
thd->lex->create_info, create_info, alter_info,
10803-
C_ALTER_TABLE_FRM_ONLY, NULL,
10804-
&key_info, &key_count, &frm);
10766+
alter_ctx.get_tmp_path(), thd->lex->create_info,
10767+
create_info, alter_info, C_ALTER_TABLE_FRM_ONLY,
10768+
NULL, &key_info, &key_count, &frm);
1080510769
thd->abort_on_warning= false;
1080610770
reenable_binlog(thd);
1080710771
if (unlikely(error))

0 commit comments

Comments
 (0)