Commit 591288a5 authored by Rich Prohaska's avatar Rich Prohaska

Merge branch 'master' into releases/tokudb-7.5

parents 26d53046 135dcf67
...@@ -3236,7 +3236,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) { ...@@ -3236,7 +3236,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) {
lock_count = 0; lock_count = 0;
if ((rows == 0 || rows > 1) && share->try_table_lock) { if ((rows == 0 || rows > 1) && share->try_table_lock) {
if (get_prelock_empty(thd) && may_table_be_empty(transaction)) { if (get_prelock_empty(thd) && may_table_be_empty(transaction) && transaction != NULL) {
if (using_ignore || 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);
} }
......
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