bk commit into 5.0 tree (patg:1.1778)

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.0 repository of patg. When patg 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.1778 05/03/01 23:23:11 patg@stripped +1 -0
  Merge pgalbraith@stripped:/home/bk/mysql-5.0
  into krsna.patg.net:/home/patg/mysql-5.0

  sql/handler.cc
    1.142 05/03/01 23:23:08 patg@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:	patg
# Host:	krsna.patg.net
# Root:	/home/patg/mysql-5.0/RESYNC

--- 1.141/sql/handler.cc	Tue Feb 22 11:02:17 2005
+++ 1.142/sql/handler.cc	Tue Mar  1 23:23:08 2005
@@ -749,7 +749,7 @@
 */
 int ha_recover(HASH *commit_list)
 {
-  int error= 0, len, got;
+  int len, got;
   handlerton **ht= handlertons, **end_ht=ht+total_ha;
   XID *list=0;
   DBUG_ENTER("ha_recover");
@@ -921,7 +921,7 @@
   for (; ht < end_ht; ht++)
   {
     int err;
-    DBUG_ASSERT((*ht)->savepoint_set);
+    DBUG_ASSERT((*ht)->savepoint_set != 0);
     if ((err= (*(*ht)->savepoint_rollback)(thd, (byte *)(sv+1)+(*ht)->savepoint_offset)))
     { // cannot happen
       my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
@@ -2233,7 +2233,7 @@
                                        (found_exts.elements+1),
                                        MYF(MY_WME | MY_FAE));
     
-    DBUG_ASSERT(ext);
+    DBUG_ASSERT(ext != 0);
     known_extensions.count= found_exts.elements;
     known_extensions.type_names= ext;