Commit 964a8139 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:5041], fix load data local on main

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@44399 c7de825b-a66e-492c-adef-691d508d4ae1
parent 8bb8263e
...@@ -3158,7 +3158,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) { ...@@ -3158,7 +3158,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) {
if (share->try_table_lock) { if (share->try_table_lock) {
if (get_prelock_empty(thd) && may_table_be_empty(transaction)) { if (get_prelock_empty(thd) && may_table_be_empty(transaction)) {
if (is_insert_ignore(thd) || thd->lex->duplicates != DUP_ERROR) { if (using_ignore || is_insert_ignore(thd) || thd->lex->duplicates != DUP_ERROR) {
acquire_table_lock(transaction, lock_write); acquire_table_lock(transaction, lock_write);
} }
else { else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment