bk commit into 4.1 tree (stewart:1.2531)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
4.1 repository of stewart. When stewart 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, 2006-10-18 22:35:03+10:00, stewart@willster.(none) +2 -0
  Merge willster.(none):/home/stewart/Documents/MySQL/4.1/ndb
  into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
  MERGE: 1.2522.1.14

  sql/ha_myisammrg.cc@stripped, 2006-10-18 22:34:59+10:00, stewart@willster.(none) +0 -0
    Auto merged
    MERGE: 1.62.1.1

  sql/sql_select.cc@stripped, 2006-10-18 22:34:59+10:00, stewart@willster.(none) +0 -0
    Auto merged
    MERGE: 1.457.1.4

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/4.1/bug19914-mk2/RESYNC

--- 1.63/sql/ha_myisammrg.cc	2006-10-18 22:35:06 +10:00
+++ 1.64/sql/ha_myisammrg.cc	2006-10-18 22:35:06 +10:00
@@ -249,9 +249,22 @@
   if (flag & HA_STATUS_CONST)
   {
     if (table->key_parts && info.rec_per_key)
+    {
+#ifdef HAVE_purify
+      /*
+        valgrind may be unhappy about it, because optimizer may access values
+        between file->keys and table->key_parts, that will be uninitialized.
+        It's safe though, because even if opimizer will decide to use a key
+        with such a number, it'll be an error later anyway.
+      */
+      bzero((char*) table->key_info[0].rec_per_key,
+            sizeof(table->key_info[0].rec_per_key) * table->key_parts);
+#endif
       memcpy((char*) table->key_info[0].rec_per_key,
 	     (char*) info.rec_per_key,
-	     sizeof(table->key_info[0].rec_per_key)*table->key_parts);
+             sizeof(table->key_info[0].rec_per_key) *
+             min(file->keys, table->key_parts));
+    }
   }
   return 0;
 }

--- 1.460/sql/sql_select.cc	2006-10-18 22:35:06 +10:00
+++ 1.461/sql/sql_select.cc	2006-10-18 22:35:06 +10:00
@@ -538,6 +538,8 @@
     {
       if (res > 1)
       {
+        thd->fatal_error();
+        error= res;
 	DBUG_RETURN(1);
       }
       if (res < 0)
@@ -1796,7 +1798,12 @@
     s->checked_keys.init();
     s->needed_reg.init();
     table_vector[i]=s->table=table=tables->table;
-    table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);// record count
+    error= table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
+    if(error)
+    {
+        table->file->print_error(error, MYF(0));
+        DBUG_RETURN(1);
+    }
     table->quick_keys.clear_all();
     table->reginfo.join_tab=s;
     table->reginfo.not_exists_optimize=0;