diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-13 15:50:30 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-13 15:50:30 +0300 |
| commit | 3974119b5f1a735d4087105eb8c07f241a70f64b (patch) | |
| tree | 9b5d0d5098c97ae49c22be860572ba78e7471faa /sql/ha_berkeley.cc | |
| parent | 0cdddbf144de80d1c4da00ee681632bc0ac6c7c9 (diff) | |
| parent | 74ea459412f9a479ea1385a72cc27b4245c06435 (diff) | |
| download | mariadb-git-3974119b5f1a735d4087105eb8c07f241a70f64b.tar.gz | |
merge with 4.0 for more memory allocation variables.
configure.in:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
scripts/Makefile.am:
merge
sql/log_event.cc:
merge
sql/mysqld.cc:
merge
sql/opt_range.cc:
merge
sql/set_var.cc:
merge
sql/sql_class.h:
merge
sql/sql_delete.cc:
merge
sql/sql_parse.cc:
merge
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, |