1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge branch '10.2' into 10.3

This commit is contained in:
Sergei Golubchik
2019-03-17 13:06:41 +01:00
147 changed files with 1449 additions and 781 deletions

View File

@ -1806,7 +1806,7 @@ bool Table_triggers_list::drop_all_triggers(THD *thd, const LEX_CSTRING *db,
bool result= 0;
DBUG_ENTER("Triggers::drop_all_triggers");
bzero(&table, sizeof(table));
table.reset();
init_sql_alloc(&table.mem_root, "Triggers::drop_all_triggers", 8192, 0,
MYF(0));
@ -2058,7 +2058,7 @@ bool Table_triggers_list::change_table_name(THD *thd, const LEX_CSTRING *db,
Trigger *err_trigger;
DBUG_ENTER("Triggers::change_table_name");
bzero(&table, sizeof(table));
table.reset();
init_sql_alloc(&table.mem_root, "Triggers::change_table_name", 8192, 0,
MYF(0));