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

[t:4518], make handerlton fix

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

6
storage/tokudb/ha_tokudb.cc
View file

@ -3152,7 +3152,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 (using_ignore || get_load_save_space(thd)) { if (using_ignore) {
acquire_table_lock(transaction, lock_write); acquire_table_lock(transaction, lock_write);
} }
else { else {
@ -3160,6 +3160,8 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) {
if (!thd_test_options(thd, OPTION_RELAXED_UNIQUE_CHECKS) && !hidden_primary_key) { if (!thd_test_options(thd, OPTION_RELAXED_UNIQUE_CHECKS) && !hidden_primary_key) {
mult_put_flags[primary_key] = DB_NOOVERWRITE; mult_put_flags[primary_key] = DB_NOOVERWRITE;
} }
u_int32_t loader_flags = (get_load_save_space(thd)) ?
LOADER_USE_PUTS : 0;
int error = db_env->create_loader( int error = db_env->create_loader(
db_env, db_env,
transaction, transaction,
@ -3169,7 +3171,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) {
share->key_file, share->key_file,
mult_put_flags, mult_put_flags,
mult_dbt_flags, mult_dbt_flags,
0 loader_flags
); );
if (error) { if (error) {
assert(loader == NULL); assert(loader == NULL);