bk commit into 5.1 tree (serg:1.2556) BUG#30094

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-27 15:37:37+02:00, serg@stripped +3 -0
  Bug #30094 mi_test_all: assertion failure
  updated to keypart_map api

  storage/myisam/mi_test1.c@stripped, 2007-07-27 15:37:33+02:00, serg@stripped +3 -2
    Bug #30094 mi_test_all: assertion failure
    updated to keypart_map api

  storage/myisam/mi_test2.c@stripped, 2007-07-27 15:37:33+02:00, serg@stripped +13 -10
    Bug #30094 mi_test_all: assertion failure
    updated to keypart_map api
    prefix char keys are not supported anymore

  storage/myisam/mi_test3.c@stripped, 2007-07-27 15:37:33+02:00, serg@stripped +4 -4
    Bug #30094 mi_test_all: assertion failure
    updated to keypart_map api

diff -Nrup a/storage/myisam/mi_test1.c b/storage/myisam/mi_test1.c
--- a/storage/myisam/mi_test1.c	2007-05-10 11:59:32 +02:00
+++ b/storage/myisam/mi_test1.c	2007-07-27 15:37:33 +02:00
@@ -258,7 +258,8 @@ static int run_test(const char *filename
 	continue;
       create_key(key,j);
       my_errno=0;
-      if ((error = mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)))
+      if ((error = mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,
+                           HA_READ_KEY_EXACT)))
       {
 	if (verbose || (flags[j] >= 1 ||
 			(error && my_errno != HA_ERR_KEY_NOT_FOUND)))
@@ -285,7 +286,7 @@ static int run_test(const char *filename
   {
     create_key(key,i);
     my_errno=0;
-    error=mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT);
+    error=mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT);
     if (verbose ||
 	(error == 0 && flags[i] == 0 && unique_key) ||
 	(error && (flags[i] != 0 || my_errno != HA_ERR_KEY_NOT_FOUND)))
diff -Nrup a/storage/myisam/mi_test2.c b/storage/myisam/mi_test2.c
--- a/storage/myisam/mi_test2.c	2007-05-10 11:59:33 +02:00
+++ b/storage/myisam/mi_test2.c	2007-07-27 15:37:33 +02:00
@@ -263,7 +263,7 @@ int main(int argc, char *argv[])
       if (!j)
 	for (j=999 ; j>0 && key1[j] == 0 ; j--) ;
       sprintf(key,"%6d",j);
-      if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+      if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       {
 	printf("Test in loop: Can't find key: \"%s\"\n",key);
 	goto err;
@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
     if (j != 0)
     {
       sprintf(key,"%6d",j);
-      if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+      if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       {
 	printf("can't find key1: \"%s\"\n",key);
 	goto err;
@@ -325,7 +325,7 @@ int main(int argc, char *argv[])
     if (j != 0)
     {
       sprintf(key,"%6d",j);
-      if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+      if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       {
 	printf("can't find key1: \"%s\"\n",key);
 	goto err;
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
     DBUG_PRINT("progpos",("first - next -> last - prev -> first"));
     if (verbose) printf("	 Using key: \"%s\"  Keys: %d\n",key,dupp_keys);
 
-    if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+    if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       goto err;
     if (mi_rsame(file,read_record2,-1))
       goto err;
@@ -422,7 +422,7 @@ int main(int argc, char *argv[])
     }
 
     /* Check of mi_rnext_same */
-    if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT))
+    if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
       goto err;
     ant=1;
     while (!mi_rnext_same(file,read_record3) && ant < dupp_keys+10)
@@ -496,7 +496,7 @@ int main(int argc, char *argv[])
       goto err;
   if (bcmp(read_record2,read_record3,reclength))
      printf("Can't find last record\n");
-
+#ifdef NOT_ANYMORE
   if (!silent)
     puts("- Test read key-part");
   strmov(key2,key);
@@ -514,12 +514,14 @@ int main(int argc, char *argv[])
       goto end;
     }
   }
+#endif
   if (dupp_keys > 2)
   {
     if (!silent)
       printf("- Read key (first) - next - delete - next -> last\n");
     DBUG_PRINT("progpos",("first - next - delete - next -> last"));
-    if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)) goto err;
+    if (mi_rkey(file,read_record,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
+      goto err;
     if (mi_rnext(file,read_record3,0)) goto err;
     if (mi_delete(file,read_record3)) goto err;
     opt_delete++;
@@ -555,7 +557,8 @@ int main(int argc, char *argv[])
     if (!silent)
       printf("- Read first - delete - next -> last\n");
     DBUG_PRINT("progpos",("first - delete - next -> last"));
-    if (mi_rkey(file,read_record3,0,key,0,HA_READ_KEY_EXACT)) goto err;
+    if (mi_rkey(file,read_record3,0,key,HA_WHOLE_KEY,HA_READ_KEY_EXACT))
+      goto err;
     if (mi_delete(file,read_record3)) goto err;
     opt_delete++;
     ant=1;
@@ -618,10 +621,10 @@ int main(int argc, char *argv[])
     copy_key(file,(uint) i,(uchar*) read_record,(uchar*) key);
     copy_key(file,(uint) i,(uchar*) read_record2,(uchar*) key2);
     min_key.key= key;
-    min_key.length= USE_WHOLE_KEY;
+    min_key.keypart_map= HA_WHOLE_KEY;
     min_key.flag= HA_READ_KEY_EXACT;
     max_key.key= key2;
-    max_key.length= USE_WHOLE_KEY;
+    max_key.keypart_map= HA_WHOLE_KEY;
     max_key.flag= HA_READ_AFTER_KEY;
 
     range_records= mi_records_in_range(file,(int) i, &min_key, &max_key);
diff -Nrup a/storage/myisam/mi_test3.c b/storage/myisam/mi_test3.c
--- a/storage/myisam/mi_test3.c	2007-05-10 11:59:33 +02:00
+++ b/storage/myisam/mi_test3.c	2007-07-27 15:37:33 +02:00
@@ -243,8 +243,8 @@ int test_read(MI_INFO *file,int id)
   for (i=0 ; i < 100 ; i++)
   {
     find=rnd(100000);
-    if (!mi_rkey(file,record.id,1,(uchar*) &find,
-		 sizeof(find),HA_READ_KEY_EXACT))
+    if (!mi_rkey(file,record.id,1,(uchar*) &find, HA_WHOLE_KEY,
+                 HA_READ_KEY_EXACT))
       found++;
     else
     {
@@ -426,8 +426,8 @@ int test_update(MI_INFO *file,int id,int
   {
     tmp=rnd(100000);
     int4store(find,tmp);
-    if (!mi_rkey(file,record.id,1,(uchar*) find,
-		 sizeof(find),HA_READ_KEY_EXACT))
+    if (!mi_rkey(file,record.id,1,(uchar*) find, HA_WHOLE_KEY,
+                 HA_READ_KEY_EXACT))
       found++;
     else
     {