database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2018-02-04 18:40:06 +04:00
parent d6ed077fc8 28d4cf0c1b
commit 217fc122c8
69 changed files with 483 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_trigger.cc
View File

@ -1792,10 +1792,11 @@ bool Table_triggers_list::drop_all_triggers(THD *thd, const LEX_CSTRING *db,
TABLE table;
char path[FN_REFLEN];
bool result= 0;
DBUG_ENTER("drop_all_triggers");
DBUG_ENTER("Triggers::drop_all_triggers");
bzero(&table, sizeof(table));
init_sql_alloc(&table.mem_root, 8192, 0, MYF(0));
init_sql_alloc(&table.mem_root, "Triggers::drop_all_triggers", 8192, 0,
MYF(0));
if (Table_triggers_list::check_n_load(thd, db, name, &table, 1))
{
@ -2043,10 +2044,11 @@ bool Table_triggers_list::change_table_name(THD *thd, const LEX_CSTRING *db,
bool result= 0;
bool upgrading50to51= FALSE;
Trigger *err_trigger;
DBUG_ENTER("change_table_name");
DBUG_ENTER("Triggers::change_table_name");
bzero(&table, sizeof(table));
init_sql_alloc(&table.mem_root, 8192, 0, MYF(0));
init_sql_alloc(&table.mem_root, "Triggers::change_table_name", 8192, 0,
MYF(0));
/*
This method interfaces the mysql server code protected by