bk commit into 5.0 tree (guilhem:1.1989)

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem 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.1989 05/09/21 22:32:42 guilhem@stripped +1 -0
  WL#1012 weakening an assertion I had added

  sql/log_event.cc
    1.208 05/09/21 22:32:38 guilhem@stripped +4 -3
    The assertion was too strong, failing --ps--protocol rpl00008 in a legitimate situation
    (but that test still crashes a few lines further, BUG#12854)

# 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.0-wl1012

--- 1.207/sql/log_event.cc	2005-09-20 23:12:15 +02:00
+++ 1.208/sql/log_event.cc	2005-09-21 22:32:38 +02:00
@@ -5299,10 +5299,11 @@
   }
 
   /*
-    We did a lock_tables(), without any prior LOCK TABLES and are not in
-    prelocked mode, so this assertion should be true.
+    If "table" is not NULL, we did a successful lock_tables(), without any
+    prior LOCK TABLES and are not in prelocked mode, so this assertion should
+    be true.
   */
-  DBUG_ASSERT(thd->lock);
+  DBUG_ASSERT(!table || thd->lock);
   /*
     If we are here, there are more events to come which may use our mappings
     and our table. So don't clear mappings or close tables, just unlock