Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0

BitKeeper/etc/logging_ok

@@ -82,3 +82,4 @@ worm@altair.is.lan
 zak@balfor.local
 zak@linux.local
 zgreant@mysql.com
+tfr@beta.frontier86.ee

Build-tools/mysql-copyright

@@ -89,7 +89,7 @@ sub main
     }
     
     # everything should be ok, continue with extracting..
-    `gtar xfz ../$distfile`;
+    `tar xfz ../$distfile`;
     $pec= $? >> 8;
     abort($dir, "Extracting from tar failed!\n") if ($pec);
 
@@ -107,7 +107,7 @@ sub main
     `mv -f $destdir $newdistname`;
     
     # tar the new distribution
-    `gtar cz -f $opt_target/$newdistname.tar.gz *`;
+    `tar cz -f $opt_target/$newdistname.tar.gz *`;
     $pec= $? >> 8;
     abort($dir, "Making new tar archive failed!\n") if ($pec);
   

acinclude.m4

@@ -800,7 +800,7 @@ dnl get substituted.
 AC_DEFUN(MYSQL_CHECK_ORBIT, [
 AC_MSG_CHECKING(for ORBit)
 orbit_config_path=`which orbit-config`
-if test -n "$orbit_config_path"
+if test -n "$orbit_config_path" -a $? = 0
 then
   orbit_exec_prefix=`orbit-config --exec-prefix`
   orbit_includes=`orbit-config --cflags server`

sql/ha_heap.h

@@ -41,13 +41,14 @@ class ha_heap: public handler
   {
     return (HA_READ_RND_SAME | HA_NO_INDEX | HA_KEYPOS_TO_RNDPOS |
 	    HA_NO_BLOBS | HA_NULL_KEY | HA_REC_NOT_IN_SEQ |
-	    HA_NOT_READ_PREFIX_LAST | HA_NO_AUTO_INCREMENT);
+	    HA_NO_AUTO_INCREMENT);
   }
   ulong index_flags(uint inx) const
   {
     return ((table->key_info[inx].algorithm == HA_KEY_ALG_BTREE) ?
 	    (HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER) :
-	    (HA_ONLY_WHOLE_INDEX | HA_WRONG_ASCII_ORDER));
+	    (HA_ONLY_WHOLE_INDEX | HA_WRONG_ASCII_ORDER |
+	     HA_NOT_READ_PREFIX_LAST));
   }
   uint max_record_length() const { return HA_MAX_REC_LENGTH; }
   uint max_keys()          const { return MAX_KEY; }

sql/ha_isammrg.h

@@ -33,9 +33,9 @@ class ha_isammrg: public handler
   const char *table_type() const { return "MRG_ISAM"; }
   const char **bas_ext() const;
   ulong table_flags() const { return (HA_READ_RND_SAME | HA_KEYPOS_TO_RNDPOS |
-				      HA_NOT_READ_PREFIX_LAST |
 				      HA_REC_NOT_IN_SEQ); }
-  ulong index_flags(uint idx) const { return 0; }
+  ulong index_flags(uint idx) const { return HA_NOT_READ_PREFIX_LAST; }
+
   uint max_record_length() const { return HA_MAX_REC_LENGTH; }
   uint max_keys()          const { return 0; }
   uint max_key_parts()     const { return 0; }

sql/handler.h

@@ -81,7 +81,7 @@
 #define HA_READ_PREV		4	/* Read prev. record with same key */
 #define HA_READ_ORDER		8	/* Read through record-keys in order */
 #define HA_ONLY_WHOLE_INDEX	16	/* Can't use part key searches */
-#define HA_NOT_READ_PREFIX_LAST	32
+#define HA_NOT_READ_PREFIX_LAST	32	/* No support for index_read_last() */
 #define HA_KEY_READ_ONLY	64	/* Support HA_EXTRA_KEYREAD */
 
 /*

sql/mysqld.cc

@@ -3736,7 +3736,7 @@ struct show_var_st status_vars[]= {
   {"Created_tmp_disk_tables",  (char*) &created_tmp_disk_tables,SHOW_LONG},
   {"Created_tmp_tables",       (char*) &created_tmp_tables,     SHOW_LONG},
   {"Created_tmp_files",	       (char*) &my_tmp_file_created,	SHOW_LONG},
-  {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG},
+  {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG_CONST},
   {"Delayed_writes",           (char*) &delayed_insert_writes,  SHOW_LONG},
   {"Delayed_errors",           (char*) &delayed_insert_errors,  SHOW_LONG},
   {"Flush_commands",           (char*) &refresh_version,        SHOW_LONG_CONST},

sql/sql_select.cc

@@ -5576,7 +5576,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
 	    Use a traversal function that starts by reading the last row
 	    with key part (A) and then traverse the index backwards.
 	  */
-	  if (table->file->table_flags() & HA_NOT_READ_PREFIX_LAST)
+	  if (table->file->index_flags(ref_key) & HA_NOT_READ_PREFIX_LAST)
 	    DBUG_RETURN(0);			// Use filesort
 	  tab->read_first_record=       join_read_last_key;
 	  tab->read_record.read_record= join_read_prev_same;

support-files/mysql.spec.sh

@@ -519,7 +519,7 @@ fi
   take care of this
 - reorganized the file list: actually install man pages along
   with the binaries of the respective subpackage
-- dont include libmysqld.a in the devel subpackage as well, if we
+- do not include libmysqld.a in the devel subpackage as well, if we
   have a special "embedded" subpackage
 - reworked the package descriptions