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

4 files changed, 29 insertions, 10 deletions

diff --git a/include/config-win.h b/include/config-win.h
index 3a541e9ca88..399b28bbe24 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -85,9 +85,6 @@
 
 typedef unsigned short  ushort;
 typedef unsigned int    uint;
-#ifndef _WIN64
-typedef unsigned int size_t;
-#endif
 typedef unsigned __int64 ulonglong;	/* Microsofts 64 bit types */
 typedef __int64	longlong;
 typedef int sigset_t;
@@ -96,6 +93,12 @@ typedef int sigset_t;
    Use my_off_t or os_off_t instead */
 typedef	long off_t;
 typedef __int64 os_off_t;
+#ifdef _WIN64
+typedef UINT_PTR rf_SetTimer;
+#else
+typedef unsigned int size_t;
+typedef uint rf_SetTimer;
+#endif
 
 #define Socket_defined
 #define my_socket SOCKET
@@ -288,4 +291,3 @@ inline double ulonglong2double(ulonglong value)
 #define statistic_add(V,C,L)     (V)+=(C)
 #endif
 #define statistic_increment(V,L) thread_safe_increment((V),(L))
-
diff --git a/include/global.h b/include/global.h
index bb7ee1b6cba..c56b1f83dc3 100644
--- a/include/global.h
+++ b/include/global.h
@@ -572,7 +572,9 @@ typedef long		longlong;
 #endif
 #undef  SIZEOF_OFF_T
 #define SIZEOF_OFF_T	    8
-#endif
+#else
+#define SYSTEM_SIZEOF_OFF_T SIZEOF_OFF_T
+#endif /* USE_RAID */
 
 #if SIZEOF_OFF_T > 4
 typedef ulonglong my_off_t;
diff --git a/include/my_base.h b/include/my_base.h
index 429c7132444..5b16e79798d 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -262,4 +262,11 @@ typedef ulong		ha_rows;
 
 #define HA_POS_ERROR	(~ (ha_rows) 0)
 #define HA_OFFSET_ERROR	(~ (my_off_t) 0)
+
+#if SYSTEM_SIZEOF_OFF_T == 4
+#define MAX_FILE_SIZE	INT_MAX32
+#else
+#define MAX_FILE_SIZE	LONGLONG_MAX
+#endif
+
 #endif /* _my_base_h */
diff --git a/include/myisam.h b/include/myisam.h
index 2b8f75b2050..a2a17636b1d 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -43,6 +43,8 @@ extern "C" {
 #define MI_MAX_MSG_BUF      1024 /* used in CHECK TABLE, REPAIR TABLE */
 #define MI_NAME_IEXT	".MYI"
 #define MI_NAME_DEXT	".MYD"
+/* Max extra space to use when sorting keys */
+#define MI_MAX_TEMP_LENGTH	1024L*1024L*1024L
 
 #define mi_portable_sizeof_char_ptr 8
 
@@ -263,9 +265,13 @@ extern uint mi_get_pointer_length(ulonglong file_length, uint def);
 #define T_MEDIUM	T_READONLY*2
 #define T_AUTO_INC	T_MEDIUM*2
 #define T_CHECK		T_AUTO_INC*2
-#define T_UPDATE_STATE	T_CHECK*2
-#define T_CHECK_ONLY_CHANGED T_UPDATE_STATE*2
-#define T_DONT_CHECK_CHECKSUM T_CHECK_ONLY_CHANGED*2 
+#define T_UPDATE_STATE		T_CHECK*2
+#define T_CHECK_ONLY_CHANGED	T_UPDATE_STATE*2
+#define T_DONT_CHECK_CHECKSUM	T_CHECK_ONLY_CHANGED*2
+#define T_TRUST_HEADER		T_DONT_CHECK_CHECKSUM*2
+#define T_CREATE_MISSING_KEYS	T_TRUST_HEADER*2
+#define T_SAFE_REPAIR		T_CREATE_MISSING_KEYS*2
+#define T_AUTO_REPAIR   	T_SAFE_REPAIR*2
 
 #define O_NEW_INDEX	1		/* Bits set in out_flag */
 #define O_NEW_DATA	2
@@ -357,8 +363,8 @@ int lock_file(MI_CHECK *param, File file, my_off_t start, int lock_type,
 	      const char *filetype, const char *filename);
 void lock_memory(MI_CHECK *param);
 int flush_blocks(MI_CHECK *param, File file);
- void update_auto_increment_key(MI_CHECK *param, MI_INFO *info,
-				my_bool repair);
+void update_auto_increment_key(MI_CHECK *param, MI_INFO *info,
+			       my_bool repair);
 int update_state_info(MI_CHECK *param, MI_INFO *info,uint update);
 int filecopy(MI_CHECK *param, File to,File from,my_off_t start,
 	     my_off_t length, const char *type);
@@ -370,6 +376,8 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
 			  ulong);
 int test_if_almost_full(MI_INFO *info);
 int recreate_table(MI_CHECK *param, MI_INFO **org_info, char *filename);
+void mi_dectivate_non_unique_index(MI_INFO *info, ha_rows rows);
+my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows);
 
 #ifdef	__cplusplus
 }