diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
| commit | 5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f (patch) | |
| tree | d21225ac09b301f317ca89093128769a5ede9fbb /sql/event_data_objects.cc | |
| parent | 780871d8b90fe3146db39b4be65ebedb309b9f9b (diff) | |
| parent | 5128b54c38ae183d18a29e00b318c22046445715 (diff) | |
| download | mariadb-git-5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f.tar.gz | |
Manual merge of mysql-next-mr-runtime upstream.
Diffstat (limited to 'sql/event_data_objects.cc')
| -rw-r--r-- | sql/event_data_objects.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 23eec749a30..b2bbd340e14 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -196,7 +196,7 @@ Event_basic::Event_basic() { DBUG_ENTER("Event_basic::Event_basic"); /* init memory root */ - init_alloc_root(&mem_root, 256, 512); + init_sql_alloc(&mem_root, 256, 512); dbname.str= name.str= NULL; dbname.length= name.length= 0; time_zone= NULL; |