diff options
author | monty@narttu.mysql.fi <> | 2000-11-16 20:55:52 +0200 |
---|---|---|
committer | monty@narttu.mysql.fi <> | 2000-11-16 20:55:52 +0200 |
commit | ca2cca8dce9fa5029f5a96d6b266e0fbdc4bc5f8 (patch) | |
tree | 73da460ce6a9f196fc94d6ac2b197566c0bf4958 /sql/sql_class.cc | |
parent | ea0f9d358cf5b2fab76270eef7dd7ac537f803a9 (diff) | |
parent | 217ef71afa160276b1dbf762bd6351219193ffcc (diff) | |
download | mariadb-git-ca2cca8dce9fa5029f5a96d6b266e0fbdc4bc5f8.tar.gz |
merge
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) |