Commit 1f118574 authored by evgen@moonbone.local's avatar evgen@moonbone.local
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  moonbone.local:/mnt/gentoo64/work/29261-bug-5.0-opt-mysql
parents 9a9263a3 fc601d77

mysql-test/r/ctype_collate.result

+8 −0
Original line number Diff line number Diff line
@@ -595,3 +595,11 @@ EXPLAIN SELECT * FROM t1 WHERE s2 LIKE 'a' COLLATE latin1_german1_ci; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	s2	NULL	NULL	NULL	10	Using where

DROP TABLE t1;

create table t1(f1 varchar(10) character set latin2 collate latin2_hungarian_ci, key(f1));

insert into t1 set f1=0x3F3F9DC73F;

insert into t1 set f1=0x3F3F1E563F;

insert into t1 set f1=0x3F3F;

check table t1 extended;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

mysql-test/t/ctype_collate.test

+11 −0
Original line number Diff line number Diff line
@@ -207,3 +207,14 @@ EXPLAIN SELECT * FROM t1 WHERE s2 LIKE 'a' COLLATE latin1_german1_ci; 
DROP TABLE t1;



# End of 4.1 tests



#

# Bug#29261: Sort order of the collation wasn't used when comparing trailing

#            spaces.

#

create table t1(f1 varchar(10) character set latin2 collate latin2_hungarian_ci, key(f1));

insert into t1 set f1=0x3F3F9DC73F;

insert into t1 set f1=0x3F3F1E563F;

insert into t1 set f1=0x3F3F;

check table t1 extended;

drop table t1;

strings/ctype-simple.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ int my_strnncollsp_simple(CHARSET_INFO * cs, const uchar *a, uint a_length, 
    for (end= a + a_length-length; a < end ; a++)

    {

      if (*a != ' ')

	return (*a < ' ') ? -swap : swap;

	return (map[*a] < ' ') ? -swap : swap;

    }

  }

  return res;