summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2000-11-27 02:44:41 +0200
committermonty@narttu.mysql.fi <>2000-11-27 02:44:41 +0200
commitad2e43c7d6f4b7bbe5b92830ef11856c7d18b6b5 (patch)
tree8a737a53b89e213741053e2d7b14013c4f8609a3 /sql/sql_class.h
parent4fe43649564cbb86b4facaf32dac08e19c92c798 (diff)
parentdc5e32ea40b435c13cb2d9c03e465743aff14b51 (diff)
downloadmariadb-git-ad2e43c7d6f4b7bbe5b92830ef11856c7d18b6b5.tar.gz
merge
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index af5dcc65688..4003b057c06 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -244,7 +244,8 @@ public:
delayed_insert *di;
struct st_transactions {
IO_CACHE trans_log;
- void *bdb_tid;
+ THD_TRANS all; /* Trans since BEGIN WORK */
+ THD_TRANS stmt; /* Trans for current statement */
uint bdb_lock_count;
} transaction;
Item *free_list;
@@ -293,7 +294,12 @@ public:
}
return last_insert_id;
}
- inline bool active_transaction() { return transaction.bdb_tid != 0; }
+ inline bool active_transaction()
+ {
+ return (transaction.all.bdb_tid != 0 ||
+ transaction.all.innobase_tid != 0 ||
+ transaction.all.gemeni_tid != 0);
+ }
inline gptr alloc(unsigned int size) { return alloc_root(&mem_root,size); }
inline gptr calloc(unsigned int size)
{