database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

SQL: variadic argument type fix [#307]

Browse Source
This commit is contained in:
Aleksey Midenkov
2017-11-19 09:08:41 +03:00
parent b0c44d2874
commit 4ecb38d7c9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/handler.cc
View File

@@ -6933,13 +6933,13 @@ bool Vers_parse_info::check_and_fix_alter(THD *thd, Alter_info *alter_info,
if (!(share->vers_start_field()->flags & HIDDEN_FLAG)) if (!(share->vers_start_field()->flags & HIDDEN_FLAG))
{ {
my_error(ER_VERS_SYS_FIELD_NOT_HIDDEN, MYF(0), my_error(ER_VERS_SYS_FIELD_NOT_HIDDEN, MYF(0),
share->vers_start_field()->field_name); share->vers_start_field()->field_name.str);
return true; return true;
} }
if (!(share->vers_end_field()->flags & HIDDEN_FLAG)) if (!(share->vers_end_field()->flags & HIDDEN_FLAG))
{ {
my_error(ER_VERS_SYS_FIELD_NOT_HIDDEN, MYF(0), my_error(ER_VERS_SYS_FIELD_NOT_HIDDEN, MYF(0),
share->vers_end_field()->field_name); share->vers_end_field()->field_name.str);
return true; return true;
} }
@@ -6979,7 +6979,7 @@ bool Vers_parse_info::check_and_fix_alter(THD *thd, Alter_info *alter_info,
if (f->change.str && (start == f->change || end == f->change)) if (f->change.str && (start == f->change || end == f->change))
{ {
my_error(ER_VERS_ALTER_SYSTEM_FIELD, MYF(0), f->change); my_error(ER_VERS_ALTER_SYSTEM_FIELD, MYF(0), f->change.str);
return true; return true;
} }
} }

2
sql/item.cc
View File

@@ -10385,7 +10385,7 @@ Item *Item_field::vers_optimized_fields_transformer(THD *thd, uchar *)
current_thd, Sql_condition::WARN_LEVEL_WARN, current_thd, Sql_condition::WARN_LEVEL_WARN,
ER_NON_VERSIONED_FIELD_IN_VERSIONED_QUERY, ER_NON_VERSIONED_FIELD_IN_VERSIONED_QUERY,
ER_THD(current_thd, ER_NON_VERSIONED_FIELD_IN_VERSIONED_QUERY), ER_THD(current_thd, ER_NON_VERSIONED_FIELD_IN_VERSIONED_QUERY),
field_name); field_name.str);
Item *null_item= new (thd->mem_root) Item_null(thd); Item *null_item= new (thd->mem_root) Item_null(thd);
if (null_item) if (null_item)

2
sql/partition_info.cc
View File

@@ -953,7 +953,7 @@ bool partition_info::vers_setup_expression(THD * thd, uint32 alter_add)
if (!table->versioned_by_sql()) if (!table->versioned_by_sql())
{ {
my_error(ER_VERSIONING_REQUIRED, MYF(0), table->s->table_name); my_error(ER_VERSIONING_REQUIRED, MYF(0), table->s->table_name.str);
return true; return true;
} }