bk commit into maria tree (guilhem:1.2583)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
maria 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@stripped, 2008-02-08 18:14:37+01:00, guilhem@stripped +1 -0
  Correcting assertion

  storage/maria/ha_maria.cc@stripped, 2008-02-08 18:14:35+01:00, guilhem@stripped +1 -1
    start_stmt() is passed thr_lock_type (TL_*), not int F_*.
    Though tt does not seem to matter here, F_UNLCK == TL_UNLOCK == 0
    at least on Linux and Windows.

diff -Nrup a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
--- a/storage/maria/ha_maria.cc	2008-02-08 17:51:36 +01:00
+++ b/storage/maria/ha_maria.cc	2008-02-08 18:14:35 +01:00
@@ -2258,7 +2258,7 @@ int ha_maria::start_stmt(THD *thd, thr_l
     trn= THD_TRN;
     DBUG_ASSERT(trn); // this may be called only after external_lock()
     DBUG_ASSERT(trnman_has_locked_tables(trn));
-    DBUG_ASSERT(lock_type != F_UNLCK);
+    DBUG_ASSERT(lock_type != TL_UNLOCK);
     /*
       If there was an implicit commit under this LOCK TABLES by a previous
       statement (like a DDL), at least if that previous statement was about a