bk commit into 5.0 tree (lars:1.1943)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lars. When lars 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
  1.1943 05/06/08 12:17:42 lars@stripped +2 -0
  Merge mysqldev@stripped:my/mysql-5.0-release
  into mysql.com:/home/bk/mysql-5.0

  mysql-test/r/ctype_utf8.result
    1.61 05/06/08 12:17:35 lars@stripped +0 -0
    Auto merged

  myisam/mi_key.c
    1.44 05/06/08 12:17:34 lars@stripped +0 -0
    Auto merged

# 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:	lars
# Host:	dhcppc0.ver
# Root:	/home/bk/mysql-5.0/RESYNC

--- 1.43/myisam/mi_key.c	2005-06-07 17:20:04 +02:00
+++ 1.44/myisam/mi_key.c	2005-06-08 12:17:34 +02:00
@@ -107,8 +107,7 @@
     }
     if (keyseg->flag & HA_SPACE_PACK)
     {
-      FIX_LENGTH(cs, pos, length, char_length);
-      end= pos + char_length;
+      end= pos + length;
       if (type != HA_KEYTYPE_NUM)
       {
 	while (end > pos && end[-1] == ' ')
@@ -119,7 +118,8 @@
 	while (pos < end && pos[0] == ' ')
 	  pos++;
       }
-      char_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);
       key+=char_length;

--- 1.60/mysql-test/r/ctype_utf8.result	2005-06-07 17:20:04 +02:00
+++ 1.61/mysql-test/r/ctype_utf8.result	2005-06-08 12:17:35 +02:00
@@ -901,4 +901,7 @@
 select * from t1 where city = 'Durban';
 id	city
 2	Durban
+select * from t1 where city = 'Durban ';
+id	city
+2	Durban
 drop table t1;