diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-11-21 12:48:54 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-11-21 12:48:54 +0800 |
| commit | 371ba9f0c0c7894f683ee134108835bde8179a0e (patch) | |
| tree | 821dc823aee6fd653afed43cbcce9dc52330f984 /sql/sql_trigger.cc | |
| parent | 9b65f5782e110bed71cc3ed782029d73b1faa297 (diff) | |
| parent | d51a4fae328044f6b796ad8405dbb0dc3c653762 (diff) | |
| download | mariadb-git-371ba9f0c0c7894f683ee134108835bde8179a0e.tar.gz | |
Auto merge
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index aa2ed498de1..434d17d8e58 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1660,7 +1660,7 @@ bool Table_triggers_list::drop_all_triggers(THD *thd, char *db, char *name) DBUG_ENTER("drop_all_triggers"); bzero(&table, sizeof(table)); - init_alloc_root(&table.mem_root, 8192, 0); + init_sql_alloc(&table.mem_root, 8192, 0); if (Table_triggers_list::check_n_load(thd, db, name, &table, 1)) { @@ -1871,7 +1871,7 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db, DBUG_ENTER("change_table_name"); bzero(&table, sizeof(table)); - init_alloc_root(&table.mem_root, 8192, 0); + init_sql_alloc(&table.mem_root, 8192, 0); /* This method interfaces the mysql server code protected by |