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

Fix LEX_CSTRING passed as argument of printf-like functions

Browse Source
This commit is contained in:
Nikita Malyavin
2018-09-25 17:58:39 +10:00
parent fb5ee3ff96
commit a626abb669
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/set_var.cc
View File

@ -808,7 +808,7 @@ int set_var::light_check(THD *thd)
if (var->check_type(type)) if (var->check_type(type))
{ {
int err= type == OPT_GLOBAL ? ER_LOCAL_VARIABLE : ER_GLOBAL_VARIABLE; int err= type == OPT_GLOBAL ? ER_LOCAL_VARIABLE : ER_GLOBAL_VARIABLE;
my_error(err, MYF(0), var->name); my_error(err, MYF(0), var->name.str);
return -1; return -1;
} }
if (type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL)) if (type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL))

2
sql/sql_handler.cc
View File

@ -683,7 +683,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler,
HA_ONLY_WHOLE_INDEX)) HA_ONLY_WHOLE_INDEX))
{ {
my_error(ER_KEY_DOESNT_SUPPORT, MYF(0), my_error(ER_KEY_DOESNT_SUPPORT, MYF(0),
table->file->index_type(handler->keyno), keyinfo->name); table->file->index_type(handler->keyno), keyinfo->name.str);
return 1; return 1;
} }

2
storage/innobase/handler/handler0alter.cc
View File

@ -6474,7 +6474,7 @@ dup_fk:
Sql_condition::WARN_LEVEL_WARN, Sql_condition::WARN_LEVEL_WARN,
HA_ERR_WRONG_INDEX, HA_ERR_WRONG_INDEX,
"InnoDB could not find key" "InnoDB could not find key"
" with name %s", key->name); " with name %s", key->name.str);
} else { } else {
ut_ad(!index->to_be_dropped); ut_ad(!index->to_be_dropped);
if (!index->is_primary()) { if (!index->is_primary()) {