Merge from 4.0
sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Merged from 4.0
This commit is contained in:
commit
ac57068a7b
@ -574,7 +574,10 @@ int mysql_multi_update_lock(THD *thd,
|
||||
else
|
||||
{
|
||||
DBUG_PRINT("info",("setting table `%s` for read-only", tl->alias));
|
||||
tl->lock_type= TL_READ;
|
||||
// If we are using the binary log, we need TL_READ_NO_INSERT to get
|
||||
// correct order of statements. Otherwise, we use a TL_READ lock to
|
||||
// improve performance.
|
||||
tl->lock_type= using_update_log ? TL_READ_NO_INSERT : TL_READ;
|
||||
tl->updating= 0;
|
||||
wants= SELECT_ACL;
|
||||
}
|
||||
|
@ -1111,7 +1111,7 @@ create_select:
|
||||
SELECT_SYM
|
||||
{
|
||||
LEX *lex=Lex;
|
||||
lex->lock_option= (using_update_log) ? TL_READ_NO_INSERT : TL_READ;
|
||||
lex->lock_option= using_update_log ? TL_READ_NO_INSERT : TL_READ;
|
||||
if (lex->sql_command == SQLCOM_INSERT)
|
||||
lex->sql_command= SQLCOM_INSERT_SELECT;
|
||||
else if (lex->sql_command == SQLCOM_REPLACE)
|
||||
|
Loading…
x
Reference in New Issue
Block a user