diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-10-01 15:33:21 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-10-01 15:33:21 +0300 |
| commit | 5b79e3c8d289d4811476cc8aa3c55463eeefabae (patch) | |
| tree | dcef169f923497b14f3a476eccea9935fa21fb4f /sql/handler.cc | |
| parent | 9a640f848e465f2bebd27072fa651a230e9632f9 (diff) | |
| parent | 0741a4d1b0fa15865fd7bd1a3e8a785d388dd69b (diff) | |
| download | mariadb-git-5b79e3c8d289d4811476cc8aa3c55463eeefabae.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
client/mysql_upgrade.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlslap.c:
Auto merged
client/mysqltest.c:
Auto merged
sql/handler.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
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) { |