diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2018-09-25 17:58:39 +1000 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2019-06-13 18:07:56 +1000 |
| commit | cd02f104bc480de3c9cdb0804e75d39a243b0b2e (patch) | |
| tree | 1232fdfd56c8109c8ea5567e1adbd123afdb7c0f | |
| parent | cf78b8c699d8394a52c55b38e67a865d6a44c500 (diff) | |
| download | mariadb-git-bb-10.3-nikita-fix-printfs.tar.gz | |
Fix LEX_CSTRING passed as argument of printf-like functionsbb-10.3-nikita-fix-printfs
| -rw-r--r-- | sql/set_var.cc | 2 | ||||
| -rw-r--r-- | sql/sql_handler.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 3272d0dfe5b..3711ec64aeb 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -808,7 +808,7 @@ int set_var::light_check(THD *thd) if (var->check_type(type)) { 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; } if (type == OPT_GLOBAL && check_global_access(thd, SUPER_ACL)) diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 0b37b44b7cf..9fdfd612c96 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -683,7 +683,7 @@ mysql_ha_fix_cond_and_key(SQL_HANDLER *handler, HA_ONLY_WHOLE_INDEX)) { 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; } diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 3ee4a5ba9dd..571ec821999 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -6474,7 +6474,7 @@ dup_fk: Sql_condition::WARN_LEVEL_WARN, HA_ERR_WRONG_INDEX, "InnoDB could not find key" - " with name %s", key->name); + " with name %s", key->name.str); } else { ut_ad(!index->to_be_dropped); if (!index->is_primary()) { |