Portability fixes

Fixed bug in end space handle for WHERE text_column="constant"

1 files changed, 37 insertions, 30 deletions

diff --git a/heap/hp_hash.c b/heap/hp_hash.c
index 8feae19a480..71eecc8bdf2 100644
--- a/heap/hp_hash.c
+++ b/heap/hp_hash.c
@@ -246,12 +246,12 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const byte *key)
     if (seg->type == HA_KEYTYPE_TEXT)
     {
        CHARSET_INFO *cs= seg->charset;
-       uint length= ((uchar*)key) - pos;
-       uint char_length= length / cs->mbmaxlen;
-       if (length > char_length)
+       uint char_length= (uint) ((uchar*) key - pos);
+       if (cs->mbmaxlen > 1)
        {
-         char_length= my_charpos(cs, pos, pos + length, char_length);
-         set_if_smaller(char_length, length);
+         uint length= char_length;
+         char_length= my_charpos(cs, pos, pos + length, length/cs->mbmaxlen);
+         set_if_smaller(char_length, length);   /* QQ: ok to remove? */
        }
        cs->coll->hash_sort(cs, pos, char_length, &nr, &nr2);
     }
@@ -289,11 +289,12 @@ ulong hp_rec_hashnr(register HP_KEYDEF *keydef, register const byte *rec)
     if (seg->type == HA_KEYTYPE_TEXT)
     {
       CHARSET_INFO *cs= seg->charset;
-      uint char_length= seg->length / cs->mbmaxlen;
-      if (seg->length > char_length)
+      uint char_length= seg->length;
+      if (cs->mbmaxlen > 1)
       {
-        char_length= my_charpos(cs, pos, pos + seg->length, char_length);
-        set_if_smaller(char_length, seg->length);
+        char_length= my_charpos(cs, pos, pos + char_length,
+                                char_length / cs->mbmaxlen);
+        set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */
       }
       cs->coll->hash_sort(cs, pos, char_length, &nr, &nr2);
     }
@@ -417,17 +418,17 @@ int hp_rec_key_cmp(HP_KEYDEF *keydef, const byte *rec1, const byte *rec2)
     if (seg->type == HA_KEYTYPE_TEXT)
     {
       CHARSET_INFO *cs= seg->charset;
-      uint char_length= seg->length / cs->mbmaxlen;
       uint char_length1;
       uint char_length2;
       uchar *pos1= (uchar*)rec1 + seg->start;
       uchar *pos2= (uchar*)rec2 + seg->start;
-      if (seg->length > char_length)
+      if (cs->mbmaxlen > 1)
       {
+        uint char_length= seg->length / cs->mbmaxlen;
         char_length1= my_charpos(cs, pos1, pos1 + seg->length, char_length);
-        set_if_smaller(char_length1, seg->length);
+        set_if_smaller(char_length1, seg->length); /* QQ: ok to remove? */
         char_length2= my_charpos(cs, pos2, pos2 + seg->length, char_length);
-        set_if_smaller(char_length2, seg->length);
+        set_if_smaller(char_length2, seg->length); /* QQ: ok to remove? */
       }
       else
       {
@@ -468,12 +469,12 @@ int hp_key_cmp(HP_KEYDEF *keydef, const byte *rec, const byte *key)
     if (seg->type == HA_KEYTYPE_TEXT)
     {
       CHARSET_INFO *cs= seg->charset;
-      uint char_length= seg->length / cs->mbmaxlen;
       uint char_length_key;
       uint char_length_rec;
       uchar *pos= (uchar*) rec + seg->start;
-      if (seg->length > char_length)
+      if (cs->mbmaxlen > 1)
       {
+        uint char_length= seg->length / cs->mbmaxlen;
         char_length_key= my_charpos(cs, key, key + seg->length, char_length);
         set_if_smaller(char_length_key, seg->length);
         char_length_rec= my_charpos(cs, pos, pos + seg->length, char_length);
@@ -509,21 +510,22 @@ void hp_make_key(HP_KEYDEF *keydef, byte *key, const byte *rec)
   for (seg=keydef->seg,endseg=seg+keydef->keysegs ; seg < endseg ; seg++)
   {
     CHARSET_INFO *cs= seg->charset;
-    uint char_length= (cs && cs->mbmaxlen > 1) ? seg->length / cs->mbmaxlen :
-                                                 seg->length;
+    uint char_length= seg->length;
     uchar *pos= (uchar*) rec + seg->start;
     if (seg->null_bit)
       *key++= test(rec[seg->null_pos] & seg->null_bit);
-    if (seg->length > char_length)
+    if (cs->mbmaxlen > 1)
     {
-      char_length= my_charpos(cs, pos, pos + seg->length, char_length);
-      set_if_smaller(char_length, seg->length);
+      char_length= my_charpos(cs, pos, pos + seg->length,
+                              char_length / cs->mbmaxlen);
+      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */
     }
     memcpy(key,rec+seg->start,(size_t) char_length);
     key+= char_length;
   }
 }
 
+
 uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, 
 		    const byte *rec, byte *recpos)
 {
@@ -575,13 +577,13 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key,
       }
       continue;
     }
-    char_length= seg->length / (seg->charset ? seg->charset->mbmaxlen : 1);
-    if (seg->length > char_length)
+    char_length= seg->length;
+    if (seg->charset->mbmaxlen > 1)
     {
       char_length= my_charpos(seg->charset, 
-                              rec + seg->start, rec + seg->start + seg->length,
-                              char_length);
-      set_if_smaller(char_length, seg->length);
+                              rec + seg->start, rec + seg->start + char_length,
+                              char_length / seg->charset->mbmaxlen);
+      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */
       if (char_length < seg->length)
         seg->charset->cset->fill(seg->charset, key + char_length, 
                                  seg->length - char_length, ' ');
@@ -593,7 +595,9 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key,
   return key - start_key;
 }
 
-uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, uint k_len)
+
+uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old,
+                    uint k_len)
 {
   HA_KEYSEG *seg, *endseg;
   uchar *start_key= key;
@@ -623,11 +627,12 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, uint k_len)
       }
       continue;
     }
-    char_length= seg->length / (seg->charset ? seg->charset->mbmaxlen : 1);
-    if (seg->length > char_length)
+    char_length= seg->length;
+    if (seg->charset->mbmaxlen > 1)
     {
-      char_length= my_charpos(seg->charset, old, old+seg->length, char_length);
-      set_if_smaller(char_length, seg->length);
+      char_length= my_charpos(seg->charset, old, old+char_length,
+                              char_length / seg->charset->mbmaxlen);
+      set_if_smaller(char_length, seg->length); /* QQ: ok to remove? */
       if (char_length < seg->length)
         seg->charset->cset->fill(seg->charset, key + char_length, 
                                  seg->length - char_length, ' ');
@@ -639,12 +644,14 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, uint k_len)
   return key - start_key;
 }
 
+
 uint hp_rb_key_length(HP_KEYDEF *keydef, 
 		      const byte *key __attribute__((unused)))
 {
   return keydef->length;
 }
 
+
 uint hp_rb_null_key_length(HP_KEYDEF *keydef, const byte *key)
 {
   const byte *start_key= key;