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, 4 insertions, 1 deletions

diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 6f7db9c5a48..8f6af5a811b 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -217,13 +217,16 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
       table->time_stamp=0;
     table->next_number_field=table->found_next_number_field;
     VOID(table->file->extra(HA_EXTRA_WRITE_CACHE));
+    table->file->deactivate_non_unique_index((ha_rows) 0);
     table->copy_blobs=1;
     if (!field_term->length() && !enclosed->length())
       error=read_fixed_length(thd,info,table,fields,read_info);
     else
       error=read_sep_field(thd,info,table,fields,read_info,*enclosed);
-    if (table->file->extra(HA_EXTRA_NO_CACHE))
+    if (table->file->extra(HA_EXTRA_NO_CACHE) ||
+	table->file->activate_all_index((ha_rows) 0))
       error=1; /* purecov: inspected */
+      
     table->time_stamp=save_time_stamp;
     table->next_number_field=0;
     if (thd->lock)