Merge with 4.0.17

BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0umod.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_dbug.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/func_op.result:
  Auto merged
Build-tools/Bootstrap:
  Merge with 4.0
client/mysql.cc:
  Merge with 4.0
client/mysqldump.c:
  Merge with 4.0
client/mysqltest.c:
  Use local version
innobase/btr/btr0cur.c:
  Merge with 4.0 (Heikki should check if we should remove btr_cur_update_sec_rec_in_place()
libmysql/libmysql.c:
  Merge with 4.0
libmysqld/lib_sql.cc:
  Merge with 4.0
myisam/mi_key.c:
  Merge with 4.0
myisam/mi_search.c:
  Merge with 4.0
mysql-test/r/binary.result:
  Merge with 4.0
mysql-test/r/func_group.result:
  Merge with 4.0
mysql-test/r/func_str.result:
  Merge with 4.0
mysql-test/r/func_time.result:
  Merge with 4.0
mysql-test/r/group_by.result:
  Merge with 4.0
mysql-test/r/handler.result:
  Merge with 4.0
mysql-test/r/innodb.result:
  Merge with 4.0
mysql-test/r/insert.result:
  Merge with 4.0
mysql-test/r/join_outer.result:
  Merge with 4.0
mysql-test/r/loaddata.result:
  Merge with 4.0
mysql-test/r/lowercase_table.result:
  Merge with 4.0
mysql-test/r/multi_update.result:
  Merge with 4.0
mysql-test/r/mysqldump.result:
  Merge with 4.0
mysql-test/r/query_cache.result:
  Merge with 4.0
mysql-test/r/rpl_max_relay_size.result:
  Merge with 4.0
mysql-test/r/rpl_rotate_logs.result:
  Merge with 4.0
mysql-test/r/rpl_trunc_binlog.result:
  Merge with 4.0
mysql-test/r/select_found.result:
  Merge with 4.0
mysql-test/r/symlink.result:
  Merge with 4.0
mysql-test/r/truncate.result:
  Merge with 4.0
mysql-test/r/type_blob.result:
  Merge with 4.0
mysql-test/r/type_datetime.result:
  Merge with 4.0
mysql-test/r/type_decimal.result:
  Merge with 4.0
mysql-test/r/type_enum.result:
  Merge with 4.0
mysql-test/r/type_timestamp.result:
  Merge with 4.0
mysql-test/r/union.result:
  Merge with 4.0
mysql-test/t/auto_increment.test:
  Merge with 4.0
mysql-test/t/bdb.test:
  Merge with 4.0
mysql-test/t/func_group.test:
  Merge with 4.0
mysql-test/t/func_op.test:
  Merge with 4.0
mysql-test/t/func_str.test:
  Merge with 4.0
mysql-test/t/func_time.test:
  Merge with 4.0
mysql-test/t/group_by.test:
  Merge with 4.0
mysql-test/t/handler.test:
  Merge with 4.0
mysql-test/t/innodb.test:
  Merge with 4.0
mysql-test/t/insert.test:
  Merge with 4.0
mysql-test/t/join_outer.test:
  Merge with 4.0
mysql-test/t/limit.test:
  Merge with 4.0
mysql-test/t/loaddata.test:
  Merge with 4.0
mysql-test/t/lowercase_table.test:
  Merge with 4.0
mysql-test/t/multi_update.test:
  Merge with 4.0
mysql-test/t/mysqldump.test:
  Merge with 4.0
mysql-test/t/query_cache.test:
  Merge with 4.0
mysql-test/t/rpl_log_pos.test:
  Merge with 4.0
mysql-test/t/rpl_max_relay_size.test:
  Merge with 4.0
mysql-test/t/rpl_rotate_logs.test:
  Merge with 4.0
mysql-test/t/rpl_trunc_binlog.test:
  Merge with 4.0
mysql-test/t/select_found.test:
  Merge with 4.0
mysql-test/t/symlink.test:
  Merge with 4.0
mysql-test/t/truncate.test:
  Merge with 4.0
mysql-test/t/type_blob.test:
  Merge with 4.0
mysql-test/t/type_datetime.test:
  Merge with 4.0
mysql-test/t/type_decimal.test:
  Merge with 4.0
mysql-test/t/type_enum.test:
  Merge with 4.0
mysql-test/t/type_timestamp.test:
  Merge with 4.0
mysql-test/t/union.test:
  Merge with 4.0
mysys/charset.c:
  Merge with 4.0
mysys/my_init.c:
  Merge with 4.0
mysys/my_symlink.c:
  Merge with 4.0
mysys/my_thr_init.c:
  Merge with 4.0
regex/reginit.c:
  Merge with 4.0
sql/field.cc:
  Change fix_datetime() to print errors
sql/field.h:
  Merge with 4.0
sql/ha_innodb.cc:
  Merge with 4.0
sql/item.cc:
  Merge with 4.0
sql/item.h:
  Merge with 4.0
sql/item_cmpfunc.cc:
  Merge with 4.0
sql/item_func.cc:
  Merge with 4.0
sql/item_func.h:
  Merge with 4.0
sql/item_strfunc.cc:
  Merge with 4.0
sql/item_strfunc.h:
  Merge with 4.0
sql/item_sum.cc:
  Merge with 4.0
sql/item_sum.h:
  Merge with 4.0
sql/item_timefunc.cc:
  Merge with 4.0
sql/lex.h:
  Merge with 4.0
sql/log.cc:
  Merge with 4.0
sql/log_event.cc:
  Merge with 4.0
sql/log_event.h:
  Merge with 4.0
sql/mysql_priv.h:
  Merge with 4.0
sql/mysqld.cc:
  Merge with 4.0
sql/nt_servc.cc:
  Merge with 4.0
sql/opt_range.cc:
  Merge with 4.0
sql/records.cc:
  Merge with 4.0
sql/repl_failsafe.cc:
  Merge with 4.0
sql/slave.cc:
  Merge with 4.0
sql/sql_acl.cc:
  Merge with 4.0
sql/sql_analyse.cc:
  Merge with 4.0
sql/sql_base.cc:
  Merge with 4.0
sql/sql_cache.cc:
  Merge with 4.0
sql/sql_class.h:
  Merge with 4.0
sql/sql_db.cc:
  Merge with 4.0
sql/sql_delete.cc:
  Merge with 4.0
sql/sql_insert.cc:
  Merge with 4.0
sql/sql_load.cc:
  Merge with 4.0
sql/sql_parse.cc:
  Merge with 4.0
sql/sql_rename.cc:
  Merge with 4.0
sql/sql_select.cc:
  Merge with 4.0
sql/sql_show.cc:
  Merge with 4.0
sql/sql_table.cc:
  Merge with 4.0
sql/sql_update.cc:
  Merge with 4.0
sql/sql_yacc.yy:
  Merge with 4.0
sql/table.cc:
  Merge with 4.0
sql/table.h:
  Merge with 4.0
sql/time.cc:
  Merge with 4.0
sql/uniques.cc:
  Merge with 4.0
strings/ctype-tis620.c:
  Merge with 4.0
strings/strto.c:
  Merge with 4.0
support-files/mysql.server.sh:
  Merge with 4.0
support-files/mysql.spec.sh:
  Merge with 4.0

5 files changed, 76 insertions, 29 deletions

diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index f48a12b6f28..8cbb7a71a43 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -373,10 +373,13 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
     to alloc queue with alloc_root()
   */
   res=ftb->queue.max_elements=1+query_len/(min(ft_min_word_len,2)+1);
-  ftb->queue.root=(byte **)alloc_root(&ftb->mem_root, (res+1)*sizeof(void*));
+  if (!(ftb->queue.root=
+        (byte **)alloc_root(&ftb->mem_root, (res+1)*sizeof(void*))))
+    goto err;
   reinit_queue(& ftb->queue, res, 0, 0,
                          (int (*)(void*,byte*,byte*))FTB_WORD_cmp, 0);
-  ftbe=(FTB_EXPR *)alloc_root(&ftb->mem_root, sizeof(FTB_EXPR));
+  if (!(ftbe=(FTB_EXPR *)alloc_root(&ftb->mem_root, sizeof(FTB_EXPR))))
+    goto err;
   ftbe->weight=1;
   ftbe->flags=FTB_FLAG_YES;
   ftbe->nos=1;
@@ -394,6 +397,10 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
   if (ftb->queue.elements<2) ftb->with_scan &= ~FTB_FLAG_TRUNC;
   ftb->state=READY;
   return ftb;
+err:
+  free_root(& ftb->mem_root, MYF(0));
+  my_free((gptr)ftb,MYF(0));
+  return 0;
 }
 
 
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index f9e943fe42c..02bca2911b4 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -112,20 +112,13 @@ int chk_status(MI_CHECK *param, register MI_INFO *info)
 int chk_del(MI_CHECK *param, register MI_INFO *info, uint test_flag)
 {
   reg2 ha_rows i;
-  uint j,delete_link_length;
+  uint delete_link_length;
   my_off_t empty,next_link,old_link;
   char buff[22],buff2[22];
   DBUG_ENTER("chk_del");
 
-  if (!(test_flag & T_SILENT))
-    puts("- check key delete-chain");
-
   LINT_INIT(old_link);
   param->record_checksum=0;
-  param->key_file_blocks=info->s->base.keystart;
-  for (j=0 ; j < info->s->state.header.max_block_size ; j++)
-    if (check_k_link(param,info,j))
-      goto wrong;
   delete_link_length=((info->s->options & HA_OPTION_PACK_RECORD) ? 20 :
 		      info->s->rec_reflength+1);
 
@@ -352,6 +345,18 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
   char buff[22],buff2[22];
   DBUG_ENTER("chk_key");
 
+  if (!(param->testflag & T_SILENT))
+    puts("- check key delete-chain");
+
+  param->key_file_blocks=info->s->base.keystart;
+  for (key=0 ; key < info->s->state.header.max_block_size ; key++)
+    if (check_k_link(param,info,key))
+    {
+      if (param->testflag & T_VERBOSE) puts("");
+      mi_check_print_error(param,"key delete-link-chain corrupted");
+      DBUG_RETURN(-1);
+    }
+
   if (!(param->testflag & T_SILENT)) puts("- check index reference");
 
   all_keydata=all_totaldata=key_totlength=0;
@@ -1208,9 +1213,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
   if (!rep_quick)
   {
     /* Get real path for data file */
-    fn_format(param->temp_filename,name,"", MI_NAME_DEXT,2+4+32);
     if ((new_file=my_raid_create(fn_format(param->temp_filename,
-					   param->temp_filename,"",
+					   share->data_file_name, "",
 					   DATA_TMP_EXT, 2+4),
 				 0,param->tmpfile_createflag,
 				 share->base.raid_type,
@@ -1882,11 +1886,9 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
   if (!rep_quick)
   {
     /* Get real path for data file */
-    fn_format(param->temp_filename,name,"", MI_NAME_DEXT,2+4+32);
     if ((new_file=my_raid_create(fn_format(param->temp_filename,
-					   param->temp_filename, "",
-					   DATA_TMP_EXT,
-					   2+4),
+					   share->data_file_name, "",
+					   DATA_TMP_EXT, 2+4),
 				 0,param->tmpfile_createflag,
 				 share->base.raid_type,
 				 share->base.raid_chunks,
@@ -2248,9 +2250,8 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
   if (!rep_quick)
   {
     /* Get real path for data file */
-    fn_format(param->temp_filename,name,"", MI_NAME_DEXT,2+4+32);
     if ((new_file=my_raid_create(fn_format(param->temp_filename,
-					   param->temp_filename, "",
+					   share->data_file_name, "",
 					   DATA_TMP_EXT,
 					   2+4),
 				 0,param->tmpfile_createflag,
diff --git a/myisam/mi_dbug.c b/myisam/mi_dbug.c
index 6548b38c135..02d1c7d05d6 100644
--- a/myisam/mi_dbug.c
+++ b/myisam/mi_dbug.c
@@ -137,6 +137,10 @@ void _mi_print_key(FILE *stream, register HA_KEYSEG *keyseg,
     {
       uint tmp_length;
       get_key_length(tmp_length,key);
+      /*
+	The following command sometimes gives a warning from valgrind.
+	Not yet sure if the bug is in valgrind, glibc or mysqld
+      */
       VOID(fprintf(stream,"%.*s",(int) tmp_length,key));
       key+=tmp_length;
       break;
diff --git a/myisam/mi_key.c b/myisam/mi_key.c
index 93e3b9621f3..97af156e89a 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.c
@@ -19,6 +19,7 @@
 #include "myisamdef.h"
 #include "m_ctype.h"
 #include "sp_defs.h"
+#include <assert.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
@@ -397,53 +398,86 @@ int _mi_read_key_record(MI_INFO *info, my_off_t filepos, byte *buf)
   return(-1);				/* Wrong data to read */
 }
 
+  
+/*
+  Update auto_increment info
 
-	/* Update auto_increment info */
+  SYNOPSIS
+    update_auto_increment()
+    info			MyISAM handler
+    record			Row to update
+
+  IMPLEMENTATION
+    Only replace the auto_increment value if it is higher than the previous
+    one. For signed columns we don't update the auto increment value if it's
+    less than zero.
+*/
 
 void update_auto_increment(MI_INFO *info,const byte *record)
 {
-  ulonglong value;
-  HA_KEYSEG *keyseg=info->s->keyinfo[info->s->base.auto_key-1].seg;
-  const uchar *key=(uchar*) record+keyseg->start;
+  ulonglong value= 0;			/* Store unsigned values here */
+  longlong s_value= 0;			/* Store signed values here */
+  HA_KEYSEG *keyseg= info->s->keyinfo[info->s->base.auto_key-1].seg;
+  const uchar *key= (uchar*) record + keyseg->start;
 
   switch (keyseg->type) {
   case HA_KEYTYPE_INT8:
+    s_value= (longlong) *(char*)key;
+    break;
   case HA_KEYTYPE_BINARY:
     value=(ulonglong)  *(uchar*) key;
     break;
   case HA_KEYTYPE_SHORT_INT:
+    s_value= (longlong) sint2korr(key);
+    break;
   case HA_KEYTYPE_USHORT_INT:
     value=(ulonglong) uint2korr(key);
     break;
   case HA_KEYTYPE_LONG_INT:
+    s_value= (longlong) sint4korr(key);
+    break;
   case HA_KEYTYPE_ULONG_INT:
     value=(ulonglong) uint4korr(key);
     break;
   case HA_KEYTYPE_INT24:
+    s_value= (longlong) sint3korr(key);
+    break;
   case HA_KEYTYPE_UINT24:
     value=(ulonglong) uint3korr(key);
     break;
-  case HA_KEYTYPE_FLOAT:			/* This shouldn't be used */
+  case HA_KEYTYPE_FLOAT:                        /* This shouldn't be used */
   {
     float f_1;
     float4get(f_1,key);
-    value = (ulonglong) f_1;
+    /* Ignore negative values */
+    value = (f_1 < (float) 0.0) ? 0 : (ulonglong) f_1;
     break;
   }
-  case HA_KEYTYPE_DOUBLE:			/* This shouldn't be used */
+  case HA_KEYTYPE_DOUBLE:                       /* This shouldn't be used */
   {
     double f_1;
     float8get(f_1,key);
-    value = (ulonglong) f_1;
+    /* Ignore negative values */
+    value = (f_1 < 0.0) ? 0 : (ulonglong) f_1;
     break;
   }
   case HA_KEYTYPE_LONGLONG:
+    s_value= sint8korr(key);
+    break;
   case HA_KEYTYPE_ULONGLONG:
     value= uint8korr(key);
     break;
   default:
-    value=0;					/* Error */
+    DBUG_ASSERT(0);
+    value=0;                                    /* Error */
     break;
   }
-  set_if_bigger(info->s->state.auto_increment,value);
+
+  /*
+    The following code works becasue if s_value < 0 then value is 0
+    and if s_value == 0 then value will contain either s_value or the
+    correct value.
+  */
+  set_if_bigger(info->s->state.auto_increment,
+                (s_value > 0) ? (ulonglong) s_value : value);
 }
diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index d5492ae5e35..2c4661c4d3e 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -867,6 +867,8 @@ char *mi_state_info_read(char *ptr, MI_STATE_INFO *state)
   state->status = mi_uint4korr(ptr);		ptr +=4;
   state->update_count=mi_uint4korr(ptr);	ptr +=4;
 
+  ptr+= state->state_diff_length;
+
   for (i=0; i < keys; i++)
   {
     state->key_root[i]= mi_sizekorr(ptr);	ptr +=8;
@@ -875,7 +877,6 @@ char *mi_state_info_read(char *ptr, MI_STATE_INFO *state)
   {
     state->key_del[i] = mi_sizekorr(ptr);	ptr +=8;
   }
-  ptr+= state->state_diff_length;
   state->sec_index_changed = mi_uint4korr(ptr); ptr +=4;
   state->sec_index_used =    mi_uint4korr(ptr); ptr +=4;
   state->version     = mi_uint4korr(ptr);	ptr +=4;