diff options
| author | unknown <serg@serg.mylan> | 2005-03-21 13:43:25 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-21 13:43:25 +0100 |
| commit | 82182de38722242c3ec5c6b7d77bdbfe271b4bc5 (patch) | |
| tree | 3f541551d44dc65b2f4c36b38024a11680b963d9 /sql/handler.cc | |
| parent | 4fd832bf9170b75354c810ad930f9cef342fb560 (diff) | |
| parent | 4ebfa64a1942ad2c221f13f63cc4ec4c1399f819 (diff) | |
| download | mariadb-git-82182de38722242c3ec5c6b7d77bdbfe271b4bc5.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
libmysql/libmysql.c:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 1ef73a9136f..78f9ce61d57 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -416,7 +416,12 @@ int ha_init() } #endif DBUG_ASSERT(total_ha < MAX_HA); - opt_using_transactions= total_ha>opt_bin_log; + /* + Check if there is a transaction-capable storage engine besides the + binary log (which is considered a transaction-capable storage engine in + counting total_ha) + */ + opt_using_transactions= total_ha>(ulong)opt_bin_log; savepoint_alloc_size+= sizeof(SAVEPOINT); return error; } |