diff options
| author | monty@mashka.mysql.fi <> | 2002-07-23 18:31:22 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-07-23 18:31:22 +0300 |
| commit | dddc20d9d1eea5fd526a2082a43801fed304afe4 (patch) | |
| tree | 2e458857fc65791ee553b4cde0e28ef9459050a5 /sql/ha_berkeley.cc | |
| parent | 373e19dca1d209476a15d7d61cb350361c9d6efa (diff) | |
| download | mariadb-git-dddc20d9d1eea5fd526a2082a43801fed304afe4.tar.gz | |
New SET syntax & system variables.
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 0aace45da94..e34bfdea2dd 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -1701,7 +1701,7 @@ int ha_berkeley::external_lock(THD *thd, int lock_type) DBUG_ASSERT(thd->transaction.stmt.bdb_tid == 0); transaction=0; // Safety /* First table lock, start transaction */ - if ((thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN | + if ((thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN | OPTION_TABLE_LOCK)) && !thd->transaction.all.bdb_tid) { |