Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  mysql.com:/home/my/mysql-5.1


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
client/mysqldump.c:
  Manual merge (trivial)
scripts/mysql_install_db.sh:
  Complex merge (parital rewrite of new code)
sql/sql_show.cc:
  Manual merge
tests/mysql_client_test.c:
  then
    if ! test -x "$print_defaults"
    then
      missing_in_basedir my_print_defaults
      exit 1
    fi
  else

4 files changed, 57 insertions, 53 deletions

diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index 2e7c47e17b4..4934792de80 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -270,8 +270,9 @@ int ha_heap::delete_row(const uchar * buf)
   return res;
 }
 
-int ha_heap::index_read(uchar * buf, const uchar * key, key_part_map keypart_map,
-			enum ha_rkey_function find_flag)
+int ha_heap::index_read_map(uchar *buf, const uchar *key,
+                            key_part_map keypart_map,
+                            enum ha_rkey_function find_flag)
 {
   DBUG_ASSERT(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_key_count);
@@ -280,7 +281,8 @@ int ha_heap::index_read(uchar * buf, const uchar * key, key_part_map keypart_map
   return error;
 }
 
-int ha_heap::index_read_last(uchar *buf, const uchar *key, key_part_map keypart_map)
+int ha_heap::index_read_last_map(uchar *buf, const uchar *key,
+                                 key_part_map keypart_map)
 {
   DBUG_ASSERT(inited==INDEX);
   ha_statistic_increment(&SSV::ha_read_key_count);
@@ -290,9 +292,9 @@ int ha_heap::index_read_last(uchar *buf, const uchar *key, key_part_map keypart_
   return error;
 }
 
-int ha_heap::index_read_idx(uchar * buf, uint index, const uchar * key,
-			    key_part_map keypart_map,
-                            enum ha_rkey_function find_flag)
+int ha_heap::index_read_idx_map(uchar *buf, uint index, const uchar *key,
+                                key_part_map keypart_map,
+                                enum ha_rkey_function find_flag)
 {
   ha_statistic_increment(&SSV::ha_read_key_count);
   int error = heap_rkey(file, buf, index, key, keypart_map, find_flag);
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h
index 7db775ca15a..5c5ad43658e 100644
--- a/storage/heap/ha_heap.h
+++ b/storage/heap/ha_heap.h
@@ -79,11 +79,12 @@ public:
                                   ulonglong nb_desired_values,
                                   ulonglong *first_value,
                                   ulonglong *nb_reserved_values);
-  int index_read(uchar * buf, const uchar * key, key_part_map keypart_map,
-                 enum ha_rkey_function find_flag);
-  int index_read_last(uchar *buf, const uchar *key, key_part_map keypart_map);
-  int index_read_idx(uchar * buf, uint index, const uchar * key,
-                     key_part_map keypart_map, enum ha_rkey_function find_flag);
+  int index_read_map(uchar * buf, const uchar * key, key_part_map keypart_map,
+                     enum ha_rkey_function find_flag);
+  int index_read_last_map(uchar *buf, const uchar *key, key_part_map keypart_map);
+  int index_read_idx_map(uchar * buf, uint index, const uchar * key,
+                         key_part_map keypart_map,
+                         enum ha_rkey_function find_flag);
   int index_next(uchar * buf);
   int index_prev(uchar * buf);
   int index_first(uchar * buf);
diff --git a/storage/heap/hp_test1.c b/storage/heap/hp_test1.c
index 24eea141ad9..b1b55098a78 100644
--- a/storage/heap/hp_test1.c
+++ b/storage/heap/hp_test1.c
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
 {
   int i,j,error,deleted;
   HP_INFO *file;
-  char record[128],key[32];
+  uchar record[128],key[32];
   const char *filename;
   HP_KEYDEF keyinfo[10];
   HA_KEYSEG keyseg[4];
@@ -65,12 +65,12 @@ int main(int argc, char **argv)
       !(file= heap_open(filename, 2)))
     goto err;
   printf("- Writing records:s\n");
-  strmov(record,"          ..... key           ");
+  strmov((char*) record,"          ..... key           ");
 
   for (i=49 ; i>=1 ; i-=2 )
   {
     j=i%25 +1;
-    sprintf(key,"%6d",j);
+    sprintf((char*) key,"%6d",j);
     bmove(record+1,key,6);
     error=heap_write(file,record);
     if (heap_check_heap(file,0))
@@ -92,18 +92,18 @@ int main(int argc, char **argv)
   for (i=1 ; i<=10 ; i++)
   {
     if (i == remove_ant) { VOID(heap_close(file)) ; return (0) ; }
-    sprintf(key,"%6d",(j=(int) ((rand() & 32767)/32767.*25)));
+    sprintf((char*) key,"%6d",(j=(int) ((rand() & 32767)/32767.*25)));
     if ((error = heap_rkey(file,record,0,key,6,HA_READ_KEY_EXACT)))
     {
       if (verbose || (flags[j] == 1 ||
 		      (error && my_errno != HA_ERR_KEY_NOT_FOUND)))
-	printf("key: %s  rkey:   %3d  my_errno: %3d\n",key,error,my_errno);
+	printf("key: %s  rkey:   %3d  my_errno: %3d\n",(char*) key,error,my_errno);
     }
     else
     {
       error=heap_delete(file,record);
       if (error || verbose)
-	printf("key: %s  delete: %d  my_errno: %d\n",key,error,my_errno);
+	printf("key: %s  delete: %d  my_errno: %d\n",(char*) key,error,my_errno);
       flags[j]=0;
       if (! error)
 	deleted++;
@@ -118,7 +118,7 @@ int main(int argc, char **argv)
   printf("- Reading records with key\n");
   for (i=1 ; i<=25 ; i++)
   {
-    sprintf(key,"%6d",i);
+    sprintf((char*) key,"%6d",i);
     bmove(record+1,key,6);
     my_errno=0;
     error=heap_rkey(file,record,0,key,6,HA_READ_KEY_EXACT);
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
 	(error && (flags[i] != 0 || my_errno != HA_ERR_KEY_NOT_FOUND)))
     {
       printf("key: %s  rkey: %3d  my_errno: %3d  record: %s\n",
-	      key,error,my_errno,record+1);
+             (char*) key,error,my_errno,record+1);
     }
   }
 
@@ -150,7 +150,7 @@ int main(int argc, char **argv)
       if (verbose || (error != 0 && error != HA_ERR_RECORD_DELETED))
       {
 	printf("pos: %2d  ni_rrnd: %3d  my_errno: %3d  record: %s\n",
-	       i-1,error,my_errno,record+1);
+	       i-1,error,my_errno,(char*) record+1);
       }
     }
   }
diff --git a/storage/heap/hp_test2.c b/storage/heap/hp_test2.c
index e2a8e2f6926..e57a554e5d9 100644
--- a/storage/heap/hp_test2.c
+++ b/storage/heap/hp_test2.c
@@ -43,7 +43,7 @@ static int reclength=39;
 
 
 static int calc_check(uchar *buf,uint length);
-static void make_record(char *record, uint n1, uint n2, uint n3,
+static void make_record(uchar *record, uint n1, uint n2, uint n3,
 			const char *mark, uint count);
 
 /* Main program */
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
   int error;
   ulong pos;
   unsigned long key_check;
-  char record[128],record2[128],record3[128],key[10];
+  uchar record[128],record2[128],record3[128],key[10];
   const char *filename,*filename2;
   HP_INFO *file,*file2;
   HP_SHARE *tmp_share;
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
   signal(SIGINT,endprog);
 
   printf("- Writing records:s\n");
-  strmov(record,"          ..... key");
+  strmov((char*) record,"          ..... key");
 
   for (i=0 ; i < recant ; i++)
   {
@@ -179,10 +179,10 @@ int main(int argc, char *argv[])
     for (j=rnd(1000)+1 ; j>0 && key1[j] == 0 ; j--) ;
     if (j != 0)
     {
-      sprintf(key,"%6d",j);
+      sprintf((char*) key,"%6d",j);
       if (heap_rkey(file,record,0,key,6, HA_READ_KEY_EXACT))
       {
-	printf("can't find key1: \"%s\"\n",key);
+	printf("can't find key1: \"%s\"\n",(char*) key);
 	goto err;
       }
 #ifdef NOT_USED
@@ -192,13 +192,13 @@ int main(int argc, char *argv[])
 #endif
       if (heap_delete(file,record))
       {
-	printf("error: %d; can't delete record: \"%s\"\n", my_errno,record);
+	printf("error: %d; can't delete record: \"%s\"\n", my_errno,(char*) record);
 	goto err;
       }
       opt_delete++;
-      key1[atoi(record+keyinfo[0].seg[0].start)]--;
-      key3[atoi(record+keyinfo[2].seg[0].start)]=0;
-      key_check-=atoi(record);
+      key1[atoi((char*) record+keyinfo[0].seg[0].start)]--;
+      key3[atoi((char*) record+keyinfo[2].seg[0].start)]=0;
+      key_check-=atoi((char*) record);
       if (testflag == 2 && heap_check_heap(file,0))
       {
 	puts("Heap keys crashed");
@@ -239,10 +239,10 @@ int main(int argc, char *argv[])
       for (j=rnd(1000)+1 ; j>0 && key1[j] == 0 ; j--) ;
       if (!key1[j])
 	continue;
-      sprintf(key,"%6d",j);
+      sprintf((char*) key,"%6d",j);
       if (heap_rkey(file,record,0,key,6, HA_READ_KEY_EXACT))
       {
-	printf("can't find key1: \"%s\"\n",key);
+	printf("can't find key1: \"%s\"\n",(char*) key);
 	goto err;
       }
     }
@@ -251,19 +251,20 @@ int main(int argc, char *argv[])
       if (my_errno != HA_ERR_FOUND_DUPP_KEY || key3[n3] == 0)
       {
 	printf("error: %d; can't update:\nFrom: \"%s\"\nTo:   \"%s\"\n",
-	       my_errno,record,record2);
+	       my_errno,(char*) record, (char*) record2);
 	goto err;
       }
       if (verbose)
-	printf("Double key when tried to update:\nFrom: \"%s\"\nTo:   \"%s\"\n",record,record2);
+	printf("Double key when tried to update:\nFrom: \"%s\"\nTo:   \"%s\"\n",
+               (char*) record, (char*) record2);
     }
     else
     {
-      key1[atoi(record+keyinfo[0].seg[0].start)]--;
-      key3[atoi(record+keyinfo[2].seg[0].start)]=0;
+      key1[atoi((char*) record+keyinfo[0].seg[0].start)]--;
+      key3[atoi((char*) record+keyinfo[2].seg[0].start)]=0;
       key1[n1]++; key3[n3]=1;
       update++;
-      key_check=key_check-atoi(record)+n1;
+      key_check=key_check-atoi((char*) record)+n1;
     }
     if (testflag == 3 && heap_check_heap(file,0))
     {
@@ -281,7 +282,7 @@ int main(int argc, char *argv[])
   for (i=999, dupp_keys=found_key=0 ; i>0 ; i--)
   {
     if (key1[i] > dupp_keys) { dupp_keys=key1[i]; found_key=i; }
-    sprintf(key,"%6d",found_key);
+    sprintf((char*) key,"%6d",found_key);
   }
 
   if (dupp_keys > 3)
@@ -294,9 +295,9 @@ int main(int argc, char *argv[])
       goto err;
     if (heap_rnext(file,record3)) goto err;
     if (heap_delete(file,record3)) goto err;
-    key_check-=atoi(record3);
-    key1[atoi(record+keyinfo[0].seg[0].start)]--;
-    key3[atoi(record+keyinfo[2].seg[0].start)]=0;
+    key_check-=atoi((char*) record3);
+    key1[atoi((char*) record+keyinfo[0].seg[0].start)]--;
+    key3[atoi((char*) record+keyinfo[2].seg[0].start)]=0;
     opt_delete++;
     ant=2;
     while ((error=heap_rnext(file,record3)) == 0 ||
@@ -321,16 +322,16 @@ int main(int argc, char *argv[])
 
     if (heap_rlast(file,record3,0)) goto err;
     if (heap_delete(file,record3)) goto err;
-    key_check-=atoi(record3);
-    key1[atoi(record+keyinfo[0].seg[0].start)]--;
-    key3[atoi(record+keyinfo[2].seg[0].start)]=0;
+    key_check-=atoi((char*) record3);
+    key1[atoi((char*) record+keyinfo[0].seg[0].start)]--;
+    key3[atoi((char*) record+keyinfo[2].seg[0].start)]=0;
     opt_delete++;
     if (heap_rprev(file,record3) || heap_rprev(file,record3))
       goto err;
     if (heap_delete(file,record3)) goto err;
-    key_check-=atoi(record3);
-    key1[atoi(record+keyinfo[0].seg[0].start)]--;
-    key3[atoi(record+keyinfo[2].seg[0].start)]=0;
+    key_check-=atoi((char*) record3);
+    key1[atoi((char*) record+keyinfo[0].seg[0].start)]--;
+    key3[atoi((char*) record+keyinfo[2].seg[0].start)]=0;
     opt_delete++;
     ant=3;
     while ((error=heap_rprev(file,record3)) == 0 ||
@@ -365,10 +366,10 @@ int main(int argc, char *argv[])
   if (error)
     goto err;
   if (heap_delete(file,record3)) goto err;
-  key_check-=atoi(record3);
+  key_check-=atoi((char*) record3);
   opt_delete++;
-  key1[atoi(record+keyinfo[0].seg[0].start)]--;
-  key3[atoi(record+keyinfo[2].seg[0].start)]=0;
+  key1[atoi((char*) record+keyinfo[0].seg[0].start)]--;
+  key3[atoi((char*) record+keyinfo[2].seg[0].start)]=0;
   ant=0;
   while ((error=heap_scan(file,record3)) == 0 ||
 	 error == HA_ERR_RECORD_DELETED)
@@ -510,7 +511,7 @@ int main(int argc, char *argv[])
   for (i=999, dupp_keys=found_key=0 ; i>0 ; i--)
   {
     if (key1[i] > dupp_keys) { dupp_keys=key1[i]; found_key=i; }
-    sprintf(key,"%6d",found_key);
+    sprintf((char*) key,"%6d",found_key);
   }
   printf("- Read through all keys with first-next-last-prev\n");
   ant=0;
@@ -577,7 +578,7 @@ int main(int argc, char *argv[])
     {
       if (heap_write(file2,record))
 	goto err;
-      key_check-=atoi(record);
+      key_check-=atoi((char*) record);
       write_count++;
       if (heap_delete(file,record))
 	goto err;
@@ -684,11 +685,11 @@ static int calc_check(uchar *buf, uint length)
   return check;
 }
 
-static void make_record(char *record, uint n1, uint n2, uint n3,
+static void make_record(uchar *record, uint n1, uint n2, uint n3,
 			const char *mark, uint count)
 {
   bfill(record,reclength,' ');
-  sprintf(record,"%6d:%4d:%8d:%3.3s: %4d",
+  sprintf((char*) record,"%6d:%4d:%8d:%3.3s: %4d",
 	  n1,n2,n3,mark,count);
   record[37]='A';				/* Store A in null key */
   record[38]=1;					/* set as null */