summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-08-20 22:54:42 +0200
committerunknown <serg@serg.mylan>2004-08-20 22:54:42 +0200
commit0745a2b783becf4b3ecb095cf8e43f67e333ba90 (patch)
treee8510e5d3f6b221a69a2c61f979f3786df718f3a /sql/handler.cc
parent5f74f8d5faf57740cdd43c03a9d5a8d58a357e45 (diff)
downloadmariadb-git-0745a2b783becf4b3ecb095cf8e43f67e333ba90.tar.gz
after merge fix
myisam/Makefile.am: put zlib at the end (libtool adds the whole bunch of dependencies right after that) sql/Makefile.am: put zlib at the end (libtool adds the whole bunch of dependencies right after that)
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 39a6296a525..119e29a6a03 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -476,7 +476,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
#ifdef USING_TRANSACTIONS
if (opt_using_transactions)
{
- bool operation_done= 0;
+ bool transaction_commited= 0;
bool operation_done= 0, need_start_waiters= 0;
/* If transaction has done some updates to tables */