bk commit into 4.0 tree (1.1617)

Below is the list of changes that have just been committed into a local
4.0 repository of heikki. When heikki 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1617 03/02/26 19:52:31 heikki@xxxxxxxxxxxxxxx +1 -0
  ha_innodb.cc:
    Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY 
KEY, but inside InnoDB there is no primary key for the table

  sql/ha_innodb.cc
    1.156 03/02/26 19:52:23 heikki@xxxxxxxxxxxxxxx +7 -1
    Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY 
KEY, but inside InnoDB there is no primary key for the table

# 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: heikki
# Host: hundin.mysql.fi
# Root: /home/heikki/mysql-4.0

--- 1.155/sql/ha_innodb.cc      Wed Feb 26 19:30:57 2003
+++ 1.156/sql/ha_innodb.cc      Wed Feb 26 19:52:23 2003
@@ -1263,7 +1263,13 @@
                  The column is the row id in the automatical generation case,
                  and it will never be updated anyway.
                */
-               DBUG_ASSERT(key_used_on_scan == MAX_KEY);
+              
+               if (key_used_on_scan != MAX_KEY) {
+                       fprintf(stderr,
+"InnoDB: Warning: table %s key_used_on_scan is %lu even though there is no\n"
+"InnoDB: primary key inside InnoDB.\n",
+                               name, (ulint)key_used_on_scan);
+               }
        }
 
        auto_inc_counter_for_this_stat = 0;

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/manual.php   (the manual)
   http://lists.mysql.com/           (the list archive)

To request this thread, e-mail internals-thread7198@xxxxxxxxxxxxxxx
To unsubscribe, e-mail <internals-unsubscribe@xxxxxxxxxxxxxxx>