bk commit into 4.1 tree

[bar]

Below is the list of changes that have just been committed into a
4.1 repository of bar. When bar does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1243 02/05/06 18:52:06 bar@stripped +1 -0
  Use keyseg charset instead of default_charset_info

  heap/hp_hash.c
    1.13 02/05/06 18:52:02 bar@stripped +8 -15
    Use keyseg charset instead of default_charset_info

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	gw.udmsearch.izhnet.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.12/heap/hp_hash.c	Thu Apr 25 15:10:03 2002
+++ 1.13/heap/hp_hash.c	Mon May  6 18:52:02 2002
@@ -213,14 +213,13 @@
     }
     if (seg->type == HA_KEYTYPE_TEXT)
     {
-      if (default_charset_info->hash_sort)
-        default_charset_info->hash_sort(default_charset_info,
-        				pos,((uchar*)key)-pos,&nr,&nr2);
+      if (seg->charset->hash_sort)
+        seg->charset->hash_sort(seg->charset,pos,((uchar*)key)-pos,&nr,&nr2);
       else
       for (; pos < (uchar*) key ; pos++)
       {
 	nr^=(ulong) ((((uint) nr & 63)+nr2) * 
-		     ((uint) default_charset_info->sort_order[(uint) *pos])) + (nr << 8);
+		     ((uint) seg->charset->sort_order[(uint) *pos])) + (nr << 8);
 	nr2+=3;
       }
     }
@@ -257,14 +256,13 @@
     }
     if (seg->type == HA_KEYTYPE_TEXT)
     {
-      if (default_charset_info->hash_sort)
-        default_charset_info->hash_sort(default_charset_info,
-        				pos,end-pos,&nr,&nr2);
+      if (seg->charset->hash_sort)
+        seg->charset->hash_sort(seg->charset,pos,end-pos,&nr,&nr2);
       else
       for (; pos < end ; pos++)
       {
 	nr^=(ulong) ((((uint) nr & 63)+nr2)*
-		     ((uint) default_charset_info->sort_order[(uint) *pos]))+ (nr << 8);
+		     ((uint) seg->charset->sort_order[(uint) *pos]))+ (nr << 8);
 	nr2+=3;
       }
     }
@@ -397,7 +395,7 @@
     case HA_KEYTYPE_END:
       return 0;
     case HA_KEYTYPE_TEXT:
-      if (my_sortcmp(default_charset_info,rec1+seg->start,rec2+seg->start,seg->length))
+      if (my_sortcmp(seg->charset,rec1+seg->start,rec2+seg->start,seg->length))
 	return 1;
       break;
     default:
@@ -428,12 +426,7 @@
     }
     if (seg->type == HA_KEYTYPE_TEXT)
     {
-      /* 
-         BAR TODO: this will not use default_charset_info
-         I need Ram to apply his HEAP patches with
-         CHARSET_INFO field in HP segments
-      */
-      if (my_sortcmp(default_charset_info,rec+seg->start,key,seg->length))
+      if (my_sortcmp(seg->charset,rec+seg->start,key,seg->length))
 	return 1;
     }
     else