diff options
author | unknown <monty@narttu.mysql.fi> | 2000-11-16 20:55:52 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2000-11-16 20:55:52 +0200 |
commit | 24137ef26120c29263acda059d79e7c21fe59319 (patch) | |
tree | 73da460ce6a9f196fc94d6ac2b197566c0bf4958 /sql/sql_class.cc | |
parent | 113fb0ffaa802ebb0550d3f5829d18eea916cf10 (diff) | |
parent | 2187c0c3f3f4d0e03fdb13b8610bdc1d1006e017 (diff) | |
download | mariadb-git-24137ef26120c29263acda059d79e7c21fe59319.tar.gz |
merge
mysys/my_open.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 1b84f07fd1a..5be12636bef 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -115,7 +115,7 @@ THD::THD() ull=0; system_thread=0; bzero((char*) &mem_root,sizeof(mem_root)); -#if defined(HAVE_BDB) || defined(HAVE_INNOBASE) || defined(HAVE_GEMENI) +#if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) || defined(HAVE_GEMENI_DB) if (open_cached_file(&transactions.trans_log, mysql_tempdir,LOG_PREFIX,0,MYF(MY_WME))) killed=1; @@ -144,7 +144,7 @@ THD::~THD() close_thread_tables(this); } close_temporary_tables(this); -#if defined(HAVE_BDB) || defined(HAVE_INNOBASE) || defined(HAVE_GEMENI) +#if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) || defined(HAVE_GEMENI_DB) close_cached_file(transactions.trans_log); #endif if (global_read_lock) |