Fixed for Ia64 + delayed key creation + a lot of small bug fixes

Docs/Makefile.am:
  Removed typo
Docs/internals.texi:
  Added documentation about filesort
Docs/manual.texi:
  Lots of changes, including information about the password in the mysql.user table
config.h.in:
  ***MISSING WEAVE***
heap/hp_rnext.c:
  Fix of reading of read-next
include/config-win.h:
  Fix for Ia64
include/global.h:
  Fix for Ia64
include/my_base.h:
  Fix for Ia64
include/myisam.h:
  New repair options
isam/_dynrec.c:
  Typo fixes
isam/_search.c:
  Fix for Ia64
merge/rrnd.c:
  Fix of ORDER BY for MERGE tables
myisam/ft_eval.c:
  Fix for Ia64
myisam/ft_parser.c:
  Fix for Ia64
myisam/ft_static.c:
  Portability fixes
myisam/mi_check.c:
  Fix for Ia64 + delay key creation
myisam/mi_locking.c:
  Portability fixes
myisam/myisamdef.h:
  Fixes for automatic table repair
myisam/myisampack.c:
  Version number increment
myisammrg/myrg_rrnd.c:
  Fix of ORDER BY for mymerge tables
mysql.proj:
  Updated
mysys/charset.c:
  Fix for Ia64
mysys/mf_casecnv.c:
  Fix for Ia64
mysys/mf_pack.c:
  Fix for Ia64
mysys/mf_path.c:
  Fix for Ia64
mysys/mf_wfile.c:
  Fix for Ia64
mysys/my_alloc.c:
  Fix for Ia64
mysys/my_lib.c:
  Fix for Ia64
mysys/my_lread.c:
  Fix for Ia64
mysys/my_lwrite.c:
  Fix for Ia64
mysys/my_winthread.c:
  Fix for Ia64
mysys/string.c:
  Fix for Ia64
mysys/thr_alarm.c:
  Fix for Ia64
mysys/thr_rwlock.c:
  Fix of scheduler bug for systems without rw_locks
regex/regcomp.c:
  Fix for Ia64
regex/regex.h:
  Fix for Ia64
regex/regex2.h:
  Fix for Ia64
scripts/mysqlhotcopy.sh:
  Explicit version number (because of bitkeeper)
sql-bench/bench-init.pl.sh:
  New help message
sql-bench/server-cfg.sh:
  Updates for postgreSQL 7.0
sql/ChangeLog:
  Changelog
sql/field.cc:
  Fix of datetime function handling
sql/filesort.cc:
  More comments
sql/gen_lex_hash.cc:
  More options
sql/ha_berkeley.cc:
  Fix for part key reading
sql/ha_berkeley.h:
  Indentation
sql/ha_myisam.cc:
  Fix for delayed key creation
sql/ha_myisam.h:
  Fix for delayed key creation
sql/handler.h:
  Fix for delayed key creation
sql/item_func.cc:
  Fix of crash when using constant expression with UDF functions in WHERE
sql/item_timefunc.cc:
  Fix of datetime function handling
sql/mini_client.cc:
  Portability fix
sql/mysql_priv.h:
  Optimization of select initialization
sql/mysqld.cc:
  Portability fixes, thread cache and min argument for connect_timeout
sql/sql_load.cc:
  Delayed key handling
sql/sql_parse.cc:
  Portability fixes and select initialization optimization
sql/sql_select.cc:
  Small optimization + more comments
sql/sql_table.cc:
  Fix default value adding to blob with alter table + delayed index creation
sql/sql_yacc.yy:
  Optimized select initialization
sql/structs.h:
  Fix for part key read
strings/ctype-sjis.c:
  Fix for Ia64
strings/ctype-tis620.c:
  Fix for Ia64
strings/t_ctype.h:
  bk fix
support-files/mysql.spec.sh:
  Added comment
vio/viotest-ssl.cc:
  bk fix
vio/viotest-sslconnect.cc:
  bk fix
vio/viotest.cc:
  bk fix
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 13 insertions, 6 deletions

diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index 3e1f6f15a6b..d3504b36d44 100644
--- a/sql/gen_lex_hash.cc
+++ b/sql/gen_lex_hash.cc
@@ -27,6 +27,7 @@
 #include "lex.h"
 
 bool opt_search=0,opt_verbose=0;
+ulong opt_count=100000;
 
 #define max_allowed_array  8000	// Don't generate bigger arrays than this
 #define max_symbol	  32767	// Use this for 'not found'
@@ -316,6 +317,7 @@ void print_arrays()
 
 static struct option long_options[] =
 {
+  {"count",	    required_argument,	   0, 'c'},
   {"search",	    no_argument,	   0, 'S'},
   {"verbose",	    no_argument,	   0, 'v'},
   {"version",	    no_argument,	   0, 'V'},
@@ -328,7 +330,7 @@ static struct option long_options[] =
 
 static void usage(int version)
 {
-  printf("%s  Ver 3.0 Distrib %s, for %s (%s)\n",
+  printf("%s  Ver 3.1 Distrib %s, for %s (%s)\n",
 	 my_progname, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
   if (version)
     return;
@@ -337,6 +339,7 @@ static void usage(int version)
   puts("This program generates a perfect hashing function for the sql_lex.cc");
   printf("Usage: %s [OPTIONS]\n", my_progname);
   printf("\n\
+-c, --count=#		Try count times to find a optimal hash table\n\
 -r, --rnd1=#		Set 1 part of rnd value for hash generator\n\
 -R, --rnd2=#		Set 2 part of rnd value for hash generator\n\
 -t, --type=#		Set type of char table to generate\n\
@@ -353,10 +356,13 @@ static int get_options(int argc, char **argv)
 {
   int c,option_index=0;
 
-  while ((c=getopt_long(argc,argv,"?SvVr:R:t:",
+  while ((c=getopt_long(argc,argv,"?SvVc:r:R:t:",
 			long_options, &option_index)) != EOF)
   {
     switch(c) {
+    case 'c':
+      opt_count=atol(optarg);
+      break;
     case 'r':
       best_t1=atol(optarg);
       break;
@@ -466,8 +472,7 @@ int main(int argc,char **argv)
   int error;
   
   MY_INIT(argv[0]);
-  start_value=1277803L; best_t1=331678L;  best_t2=4097229L;  best_type=1;
- /* mode=5791  add=6  func_type: 0 */
+  start_value=6059524L; best_t1=2194873L;  best_t2=4441039L;  best_type=4; /* mode=4159  add=8  func_type: 0 */
   if (get_options(argc,(char **) argv))
     exit(1);
 
@@ -488,7 +493,7 @@ int main(int argc,char **argv)
 	   start_value, best_t1,best_t2,best_type,best_mod,best_add,
 	   best_functype);
 
-    for (uint i=1 ; i <= 100000 ; i++)
+    for (uint i=1 ; i <= opt_count ; i++)
     {
       if (i % 10 == 0)
       {
@@ -532,7 +537,9 @@ printf("/* This code is generated by gen_lex_hash.cc that seeks for a perfect\nh
 
   print_arrays();
 
-  printf("/* t1= %lu  t2=%lu  type= %d */\n\n",best_t1,best_t2,best_type);
+  printf("/* start_value=%ldL;  best_t1=%ldL;  best_t2=%ldL;  best_type=%d; */ /* mode=%d  add=%d type: %d */\n\n",
+	 start_value, best_t1, best_t2,best_type,
+	 best_mod, best_add, best_functype);
   
   printf("inline SYMBOL *get_hash_symbol(const char *s,unsigned int length,bool function)\n\
 {\n\