1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into releases/tokudb-7.5

Browse Source
This commit is contained in:
Rich Prohaska 2015-02-26 14:51:47 -05:00
commit 591288a512
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

@ -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);
} }