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

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


Docs/manual.texi:
  Auto merged

BitKeeper/etc/gone

@@ -379,3 +379,20 @@ monty@donna.mysql.com|sql-bench/Results-linux/select-mysql_dbug_full-Linux_2.2.1
 monty@donna.mysql.com|sql-bench/Results-linux/wisconsin-mysql_dbug-Linux_2.2.14_my_SMP_i686|20001218140918|10615|8dcd7271a9137341
 monty@donna.mysql.com|sql-bench/Results-linux/wisconsin-mysql_dbug_full-Linux_2.2.14_my_SMP_i686|20001218140918|13213|4398328883aa75da
 mwagner@evoq.home.mwagner.org|mysql-test/chew_on_this/select.res|20001014084759|41327|1295456b9394876
+miguel@hegel.local|zlib/Makefile.riscos|20020319032513|63798|8ab53f195fe429af
+miguel@hegel.local|zlib/amiga/Makefile.pup|20020319032513|19225|6a9ee8128d11541f
+miguel@hegel.local|zlib/amiga/Makefile.sas|20020319032513|25562|d7128ac7e0946f0b
+miguel@hegel.local|zlib/contrib/untgz/makefile.w32|20020319032516|01267|2c584f05a16db4ba
+miguel@hegel.local|zlib/msdos/Makefile.b32|20020319032518|33760|86772037f3344353
+miguel@hegel.local|zlib/msdos/Makefile.bor|20020319032518|40099|7aa9edaac099cdb9
+miguel@hegel.local|zlib/msdos/Makefile.dj2|20020319032518|46371|ca26f5fe96e3e999
+miguel@hegel.local|zlib/msdos/Makefile.emx|20020319032518|52757|64efbf8cedc146b5
+miguel@hegel.local|zlib/msdos/Makefile.msc|20020319032518|59050|1bb69abdddf390f2
+miguel@hegel.local|zlib/msdos/Makefile.tc|20020319032518|65341|2a9dff916115ae77
+miguel@hegel.local|zlib/msdos/Makefile.w32|20020319032518|06083|8d84523c1dcdc0f7
+miguel@hegel.local|zlib/msdos/Makefile.wat|20020319032518|12471|82f8714d825e97e3
+miguel@hegel.local|zlib/nt/Makefile.emx|20020319032518|31715|7e9fcf6f5ad2e51a
+miguel@hegel.local|zlib/nt/Makefile.gcc|20020319032519|03630|351fa8bd15c704b9
+miguel@hegel.local|zlib/nt/Makefile.nt|20020319032519|09990|ee461a3dd393a061
+miguel@hegel.local|zlib/os2/Makefile.os2|20020319032519|22554|7a05f2a27812703a
+miguel@hegel.local|zlib/Make_vms.com|20020319032513|57151|35050a50ec612bbf

Build-tools/Do-patch-file

@@ -13,8 +13,8 @@ NEW="mysql-$VER.tar.gz"
 OLD="mysql-$PVER.tar.gz"
 RESULT="mysql-$PVER-$VER.patch.gz"
 PATCH_DIR=/my/web/Downloads-live/Patches
-RESULT_DIR=/my/web/Downloads-live/MySQL-3.23
-RESULT_DIR_MAX=/my/web/Downloads-live/MySQL-Max-3.23
+RESULT_DIR=/my/web/Downloads-live/MySQL-4.0
+RESULT_DIR_MAX=/my/web/Downloads-live/MySQL-Max-4.0
 
 if test ! -f $NEWDIR/$NEW
 then

Docs/manual.texi

@@ -33902,7 +33902,7 @@ DELAYED} when you are really sure you need it!
 
 @example
 UPDATE [LOW_PRIORITY] [IGNORE] tbl_name
-    SET col_name1=expr1, [col_name2=expr2, ...]
+    SET col_name1=expr1 [, col_name2=expr2, ...]
     [WHERE where_definition]
     [LIMIT #]
 @end example

client/mysqldump.c

@@ -1420,8 +1420,8 @@ int main(int argc, char **argv)
       return(first_error);
     }
   }
-  if(mysql_query(sock, "set sql_query_cache_type=off") && verbose)
-    fprintf(stderr, "-- can't take off query cache (not supported).\n");
+  if(mysql_query(sock, "SET SQL_QUERY_CACHE_TYPE=OFF") && verbose)
+    fprintf(stderr, "-- Can't disable query cache (not supported).\n");
   if (opt_alldbs)
     dump_all_databases();
   /* Only one database and selected table(s) */

sql/ha_hash.h

-
-int ha_hash::create(my_string name, register TABLE *form,
-		    ulonglong auto_increment_value)
-{
-  register uint i,j;
-  char buff[FN_REFLEN];
-  KEY *pos;
-  H_KEYDEF keydef[MAX_KEY];
-  DBUG_ENTER("cre_hash");
-
-  pos=form->key_info;
-  for (i=0; i < form->keys ; i++, pos++)
-  {
-    keydef[i].hk_flag=	 pos->flags & HA_NOSAME;
-    for (j=0 ; (int7) j < pos->key_parts ; j++)
-    {
-      uint flag=pos->key_part[j].key_type;
-      if (!f_is_packed(flag) && f_packtype(flag) == (int) FIELD_TYPE_DECIMAL &&
-	  !(flag & FIELDFLAG_BINARY))
-	keydef[i].hk_keyseg[j].key_type= (int) HA_KEYTYPE_TEXT;
-      else
-	keydef[i].hk_keyseg[j].key_type= (int) HA_KEYTYPE_BINARY;
-      keydef[i].hk_keyseg[j].start=  pos->key_part[j].offset;
-      keydef[i].hk_keyseg[j].length= pos->key_part[j].length;
-    }
-    keydef[i].hk_keyseg[j].key_type= 0;
-  }
-  DBUG_RETURN(h_create(fn_format(buff,name,"","",2+4+16),i,
-		       keydef,form->reclength,form->max_rows,form->min_rows,
-		       0));
-} /* cre_hash */