summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-11-24 01:51:18 +0200
committermonty@donna.mysql.com <>2000-11-24 01:51:18 +0200
commit81bc313e99ed12ff87ca45529a11ab31acc28263 (patch)
treef7a94e9f7992838a96724db08a38f94bd9d50e27 /sql/sql_class.cc
parentc62554025dad1f70cf5335233864b390cf5de95e (diff)
downloadmariadb-git-81bc313e99ed12ff87ca45529a11ab31acc28263.tar.gz
All statements are now run in a sub transaction
Give warning if we are using non transactional tables and do ROLLBACK Porting of crash-me and benchmarks to FrontBase
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index c7d50ee182e..696c111c01a 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -79,8 +79,8 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
bootstrap(0),in_lock_tables(0),
global_read_lock(0)
{
- host=user=db=query=ip=0;
proc_info="login";
+ host=user=db=query=ip=0;
locked=killed=count_cuted_fields=some_tables_deleted=no_errors=password=
query_start_used=0;
query_length=col_access=0;
@@ -117,13 +117,12 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
ull=0;
system_thread=0;
bzero((char*) &mem_root,sizeof(mem_root));
-#if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) || defined(HAVE_GEMENI_DB)
+#ifdef USING_TRANSACTIONS
+ bzero((char*) &transaction,sizeof(transaction));
if (open_cached_file(&transaction.trans_log,
mysql_tmpdir,LOG_PREFIX,0,MYF(MY_WME)))
killed=1;
- transaction.bdb_lock_count=0;
#endif
- transaction.bdb_tid=0;
#ifdef __WIN__
real_id = 0 ;
@@ -146,7 +145,7 @@ THD::~THD()
close_thread_tables(this);
}
close_temporary_tables(this);
-#if defined(HAVE_BERKELEY_DB) || defined(HAVE_INNOBASE_DB) || defined(HAVE_GEMENI_DB)
+#ifdef USING_TRANSACTIONS
close_cached_file(&transaction.trans_log);
#endif
if (global_read_lock)