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

cleanup: safe_lexcstrdup_root()

Browse Source
This commit is contained in:
Sergei Golubchik
2018-10-12 19:24:28 +02:00
parent dfbba3d202
commit ca7401afdf
4 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_trigger.cc
View File

@ -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) ?