mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@44399 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:02:12 -04:00 committed by Yoni Fogel
parent f332f537c2
commit 19b43690e0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/tokudb/ha_tokudb.cc
View file

@ -3158,7 +3158,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) {
if (share->try_table_lock) {
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);
}
else {