Commit 41a329f9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-4.0 

into mysql.com:/home/bk/b7879-mysql-4.0


sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents fd4b5c8d 95dec435

sql/sql_update.cc

+4 −1
Original line number Diff line number Diff line
@@ -473,7 +473,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;

      }

sql/sql_yacc.yy

+2 −2
Original line number Diff line number Diff line
@@ -822,7 +822,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)