bk commit into 4.1 tree (mats:1.2175)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
4.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2175 05/02/18 14:19:08 mats@stripped +2 -0
  Merge from 4.0

  sql/sql_yacc.yy
    1.379 05/02/18 14:19:04 mats@stripped +0 -1
    Merged from 4.0

  sql/sql_update.cc
    1.142 05/02/18 14:14:10 mats@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.kindahl.net
# Root:	/home/bk/b7879-mysql-4.1/RESYNC

--- 1.141/sql/sql_update.cc	2005-02-02 19:27:58 +01:00
+++ 1.142/sql/sql_update.cc	2005-02-18 14:14:10 +01:00
@@ -574,7 +574,10 @@
       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;
       }

--- 1.378/sql/sql_yacc.yy	2005-02-13 23:35:36 +01:00
+++ 1.379/sql/sql_yacc.yy	2005-02-18 14:19:04 +01:00
@@ -1111,7 +1111,7 @@
           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)