Manual merge of mysql-next-mr-runtime upstream.

This commit is contained in:
Davi Arnaut 2009-11-19 21:48:08 -02:00
commit 5aeeaaf507
84 changed files with 2377 additions and 703 deletions

View file

@ -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;