From de70be9da6eb65875a42cf9143aa391adca44a11 Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com/bar.intranet.mysql.r18.ru>
Date: Tue, 3 Oct 2006 14:11:57 +0500
Subject: Bug#22052 Trailing spaces are not removed from UNICODE fields in an
 index   Fix: using charset-aware functions cs->cset->lengthsp() and
 cs->cset->fill()   instead of single byte code which is not UCS2 compatible.

myisam/mi_key.c:
  Using character-set aware functions to trim and append spaces.
myisam/mi_open.c:
  Initialize charset for BINARY/VARBINARY to my_charset_bin,
      instead of NULL
mysql-test/r/ctype_ucs.result:
  Adding test case
mysql-test/t/ctype_ucs.test:
  Adding test case
---
 myisam/mi_key.c  | 15 ++++++++-------
 myisam/mi_open.c |  2 ++
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'myisam')

diff --git a/myisam/mi_key.c b/myisam/mi_key.c
index eaa854b1a37..9d538d58817 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.c
@@ -42,7 +42,7 @@ static int _mi_put_key_in_record(MI_INFO *info,uint keynr,byte *record);
 uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
 		  const byte *record, my_off_t filepos)
 {
-  byte *pos,*end;
+  byte *pos;
   uchar *start;
   reg1 HA_KEYSEG *keyseg;
   my_bool is_ft= info->s->keyinfo[keynr].flag & HA_FULLTEXT;
@@ -84,18 +84,17 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key,
     pos= (byte*) record+keyseg->start;
     if (keyseg->flag & HA_SPACE_PACK)
     {
-      end= pos + length;
       if (type != HA_KEYTYPE_NUM)
       {
-	while (end > pos && end[-1] == ' ')
-	  end--;
+        length= cs->cset->lengthsp(cs, pos, length);
       }
       else
       {
+        byte *end= pos + length;
 	while (pos < end && pos[0] == ' ')
 	  pos++;
+	length=(uint) (end-pos);
       }
-      length=(uint) (end-pos);
       FIX_LENGTH(cs, pos, length, char_length);
       store_key_length_inc(key,char_length);
       memcpy((byte*) key,(byte*) pos,(size_t) char_length);
@@ -358,8 +357,10 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr,
       pos= record+keyseg->start;
       if (keyseg->type != (int) HA_KEYTYPE_NUM)
       {
-	memcpy(pos,key,(size_t) length);
-	bfill(pos+length,keyseg->length-length,' ');
+        memcpy(pos,key,(size_t) length);
+        keyseg->charset->cset->fill(keyseg->charset,
+                                    pos + length, keyseg->length - length,
+                                    ' ');
       }
       else
       {
diff --git a/myisam/mi_open.c b/myisam/mi_open.c
index a5b303f86d4..174890d57b6 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_open.c
@@ -323,6 +323,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
 	      goto err;
 	    }
 	  }
+	  else if (pos->type == HA_KEYTYPE_BINARY)
+	    pos->charset= &my_charset_bin;
 	}
 	if (share->keyinfo[i].flag & HA_SPATIAL)
 	{
-- 
cgit v1.2.1