diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-15 18:58:59 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-15 18:58:59 -0700 |
| commit | f44a41f013a8791fc2ddba88a9f23efe5cfb6c99 (patch) | |
| tree | d78befdf5251596d35567b37ed5edb3edae3f8bd /sql/sql_class.cc | |
| parent | 11b725d1a3417e7c9704a2e4d4bde519a513a0fb (diff) | |
| parent | 3e6dac34cd5b8ef322d375f3af22137822656c8a (diff) | |
| download | mariadb-git-f44a41f013a8791fc2ddba88a9f23efe5cfb6c99.tar.gz | |
merged
sql/log_event.h:
Auto merged
sql/mysqlbinlog.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_class.h:
Auto merged
BitKeeper/etc/logging_ok:
Auto converge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 5ffe96458f2..1b84f07fd1a 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -115,11 +115,17 @@ 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 (open_cached_file(&transactions.trans_log, + mysql_tempdir,LOG_PREFIX,0,MYF(MY_WME))) + killed=1; + transaction.bdb_lock_count=0; +#endif + transaction.bdb_tid=0; + #ifdef __WIN__ real_id = 0 ; #endif - transaction.bdb_lock_count=0; - transaction.bdb_tid=0; } THD::~THD() @@ -138,6 +144,9 @@ THD::~THD() close_thread_tables(this); } close_temporary_tables(this); +#if defined(HAVE_BDB) || defined(HAVE_INNOBASE) || defined(HAVE_GEMENI) + close_cached_file(transactions.trans_log); +#endif if (global_read_lock) { pthread_mutex_lock(&LOCK_open); |