diff options
| author | istruewing@chilla.local <> | 2007-08-02 16:11:27 +0200 |
|---|---|---|
| committer | istruewing@chilla.local <> | 2007-08-02 16:11:27 +0200 |
| commit | 5ec766dbe7c64551c26e2e855dc8e6d497fae8e1 (patch) | |
| tree | 9d9f803ea61ac73bd8e49f924148a4b567951c99 /sql/sql_insert.cc | |
| parent | 5008318ebaf8ca4dc545d1366f446e7271ddd044 (diff) | |
| parent | 0f9cae4843ba21ad40cf65af1e3c66bde483283c (diff) | |
| download | mariadb-git-5ec766dbe7c64551c26e2e855dc8e6d497fae8e1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-bug29838
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index b747c706f75..be97ec909f7 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -426,7 +426,6 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type, client connection and the delayed thread. */ if (specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE) || - thd->slave_thread || thd->variables.max_insert_delayed_threads == 0 || thd->prelocked_mode || thd->lex->uses_stored_routines()) @@ -434,6 +433,14 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type, *lock_type= TL_WRITE; return; } + if (thd->slave_thread) + { + /* Try concurrent insert */ + *lock_type= (duplic == DUP_UPDATE || duplic == DUP_REPLACE) ? + TL_WRITE : TL_WRITE_CONCURRENT_INSERT; + return; + } + bool log_on= (thd->options & OPTION_BIN_LOG || ! (thd->security_ctx->master_access & SUPER_ACL)); if (global_system_variables.binlog_format == BINLOG_FORMAT_STMT && |