diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-12 19:24:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-31 16:06:16 +0100 |
| commit | ca7401afdf279b99a8f6c08a332096dabd3e4c52 (patch) | |
| tree | 137b8bcc62b52e7616630f89249e21b5477addd1 /sql/sql_trigger.cc | |
| parent | dfbba3d20220e5c9219b4b879e2d99999d53c05d (diff) | |
| download | mariadb-git-ca7401afdf279b99a8f6c08a332096dabd3e4c52.tar.gz | |
cleanup: safe_lexcstrdup_root()
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index fd128f8dc1c..5d9526ca274 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -35,16 +35,6 @@ #include "sp_cache.h" // sp_invalidate_cache #include <mysys_err.h> -LEX_CSTRING *make_lex_string(LEX_CSTRING *lex_str, - const char* str, size_t length, - MEM_ROOT *mem_root) -{ - if (!(lex_str->str= strmake_root(mem_root, str, length))) - return 0; - lex_str->length= length; - return lex_str; -} - /*************************************************************************/ /** @@ -1503,8 +1493,8 @@ bool Table_triggers_list::check_n_load(THD *thd, const LEX_CSTRING *db, if (likely((name= error_handler.get_trigger_name()))) { - if (unlikely(!(make_lex_string(&trigger->name, name->str, - name->length, &table->mem_root)))) + trigger->name= safe_lexcstrdup_root(&table->mem_root, *name); + if (unlikely(!trigger->name.str)) goto err_with_lex_cleanup; } trigger->definer= ((!trg_definer || !trg_definer->length) ? |