bk commit into 5.2 tree (malff:1.2593)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.2 repository of marcsql. When marcsql 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@stripped, 2007-08-28 22:58:56-06:00, malff@weblab.(none) +2 -0
  Fixed manual merge of Bug 29936

  sql/lock.cc@stripped, 2007-08-28 22:58:51-06:00, malff@weblab.(none) +1 -0
    Fixed manual merge of Bug 29936

  sql/sql_base.cc@stripped, 2007-08-28 22:58:51-06:00, malff@weblab.(none) +0 -6
    Fixed manual merge of Bug 29936

diff -Nrup a/sql/lock.cc b/sql/lock.cc
--- a/sql/lock.cc	2007-08-28 17:24:14 -06:00
+++ b/sql/lock.cc	2007-08-28 22:58:51 -06:00
@@ -1785,6 +1785,7 @@ int set_handler_table_locks(THD *thd, TA
 
     DBUG_ASSERT((tlist->lock_type == TL_READ) ||
                 (tlist->lock_type == TL_READ_NO_INSERT) ||
+                (tlist->lock_type == TL_WRITE_DEFAULT) ||
                 (tlist->lock_type == TL_WRITE) ||
                 (tlist->lock_type == TL_WRITE_LOW_PRIORITY));
 
diff -Nrup a/sql/sql_base.cc b/sql/sql_base.cc
--- a/sql/sql_base.cc	2007-08-27 03:43:40 -06:00
+++ b/sql/sql_base.cc	2007-08-28 22:58:51 -06:00
@@ -3551,12 +3551,6 @@ int open_tables(THD *thd, TABLE_LIST **s
   {
     safe_to_ignore_table= FALSE;
 
-    if (tables->lock_type == TL_WRITE_DEFAULT)
-    {
-      tables->lock_type= thd->update_lock_default;
-      DBUG_ASSERT(tables->lock_type >= TL_WRITE_ALLOW_WRITE);
-    }
-
     /*
       Ignore placeholders for derived tables. After derived tables
       processing, link to created temporary table will be put here.