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 | c229289282eab930ffbf43a99c3333243a643f53 (patch) | |
| tree | 821dc823aee6fd653afed43cbcce9dc52330f984 /sql/sql_trigger.cc | |
| parent | 126729120de4cc09f0bce516abca6eba9062ce23 (diff) | |
| parent | eea50d60c1988dcc83e68c578ed78636bd3c5f94 (diff) | |
| download | mariadb-git-c229289282eab930ffbf43a99c3333243a643f53.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 |