summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2007-10-01 15:33:21 +0300
committermonty@narttu.mysql.fi <>2007-10-01 15:33:21 +0300
commit5dcb64882dc57f6b3b028e30768b3d5a2f9e2c97 (patch)
treedcef169f923497b14f3a476eccea9935fa21fb4f /sql
parent7ef6e66bc67bcb003a02f0996fc37315a4f87429 (diff)
parent315acca125bdfc763ed4c93a8699c8bab8ee650a (diff)
downloadmariadb-git-5dcb64882dc57f6b3b028e30768b3d5a2f9e2c97.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql')
-rw-r--r--sql/handler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 75c3a64bc27..9e47baadd4a 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2502,8 +2502,9 @@ int handler::ha_repair(THD* thd, HA_CHECK_OPT* check_opt)
int ha_enable_transaction(THD *thd, bool on)
{
int error=0;
-
DBUG_ENTER("ha_enable_transaction");
+ DBUG_PRINT("enter", ("on: %d", (int) on));
+
thd->transaction.on= on;
if (on)
{