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

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2019-03-15 20:00:28 +01:00
parent bb8c82c66a 34db9958e2
commit 0508d327ae
97 changed files with 1043 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_trigger.cc
View File

@ -1794,7 +1794,7 @@ bool Table_triggers_list::drop_all_triggers(THD *thd, char *db, char *name)
bool result= 0;
DBUG_ENTER("drop_all_triggers");
bzero(&table, sizeof(table));
table.reset();
init_sql_alloc(&table.mem_root, 8192, 0, MYF(0));
if (Table_triggers_list::check_n_load(thd, db, name, &table, 1))
@ -2044,7 +2044,7 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db,
Trigger *err_trigger;
DBUG_ENTER("change_table_name");
bzero(&table, sizeof(table));
table.reset();
init_sql_alloc(&table.mem_root, 8192, 0, MYF(0));
/*