summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorRich Prohaska <prohaska@tokutek.com>2014-05-31 11:11:36 -0400
committerRich Prohaska <prohaska@tokutek.com>2014-05-31 11:11:36 -0400
commitbf21d6334dc29c4f4a1ebebfa9a33c41a86553c7 (patch)
treee71d942abe108a56abf204cb54179620129d29c5 /storage
parentcb0ae1663a408ca3381b27f03fa703dc26e61138 (diff)
downloadmariadb-git-bf21d6334dc29c4f4a1ebebfa9a33c41a86553c7.tar.gz
#245 use row estimate parameter to start_bulk_insert to decide if a loader is used
Diffstat (limited to 'storage')
-rw-r--r--storage/tokudb/ha_tokudb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc
index ddacb6d1382..020fa3b526d 100644
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@@ -3250,7 +3250,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) {
num_DBs_locked_in_bulk = true;
lock_count = 0;
- if (share->try_table_lock) {
+ if ((rows == 0 || rows > 1) && share->try_table_lock) {
if (get_prelock_empty(thd) && may_table_be_empty(transaction)) {
if (using_ignore || is_insert_ignore(thd) || thd->lex->duplicates != DUP_ERROR) {
acquire_table_lock(transaction, lock_write);