diff options
author | monty@mashka.mysql.fi <> | 2003-10-13 15:50:30 +0300 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2003-10-13 15:50:30 +0300 |
commit | 461d1627b3323935345b13fe523f93dc74de9f36 (patch) | |
tree | 9b5d0d5098c97ae49c22be860572ba78e7471faa /sql/ha_berkeley.cc | |
parent | c60a75e9ba08cd1937e73a42ca065b992a4f47d2 (diff) | |
parent | c95d142f8f602b717c6c10d13e37b2b3ecf069d4 (diff) | |
download | mariadb-git-461d1627b3323935345b13fe523f93dc74de9f36.tar.gz |
merge with 4.0 for more memory allocation variables.
Diffstat (limited to 'sql/ha_berkeley.cc')
-rw-r--r-- | sql/ha_berkeley.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 1b99efeaa43..0795c9d6a96 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -238,7 +238,7 @@ int berkeley_show_logs(Protocol *protocol) MEM_ROOT *old_root=my_pthread_getspecific_ptr(MEM_ROOT*,THR_MALLOC); DBUG_ENTER("berkeley_show_logs"); - init_alloc_root(&show_logs_root, 1024, 1024); + init_sql_alloc(&show_logs_root, 1024, 1024); my_pthread_setspecific_ptr(THR_MALLOC,&show_logs_root); if ((error= db_env->log_archive(db_env, &all_logs, |