Commit f58d5b03 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1
parents c596940e 14707d71

mysql-test/r/ctype_latin1.result

+5 −0
Original line number Diff line number Diff line
@@ -325,3 +325,8 @@ latin1_bin 6109 
latin1_bin	61

latin1_bin	6120

drop table t1;

CREATE TABLE a (a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a (a int)' at line 1

SELECT 'a' as str;

str

a

mysql-test/r/ctype_utf8.result

+3 −0
Original line number Diff line number Diff line
@@ -861,3 +861,6 @@ user c 
one	<one>

two	<two>

DROP TABLE t1;

select convert(_koi8r'' using utf8) < convert(_koi8r'' using utf8);

convert(_koi8r'' using utf8) < convert(_koi8r'' using utf8)

1

mysql-test/t/ctype_latin1.test

+9 −0
Original line number Diff line number Diff line
@@ -66,3 +66,12 @@ SET collation_connection='latin1_swedish_ci'; 
-- source include/ctype_filesort.inc

SET collation_connection='latin1_bin';

-- source include/ctype_filesort.inc



#

# Bug#8041

# An unknown character (e.g. 0x84) should result in ERROR,

# It was treated like a space character earlier.

# Howerver, it should still work fine as a string part.

--error 1064

CREATE TABLE a (a int);

SELECT 'a' as str;

mysql-test/t/ctype_utf8.test

+5 −0
Original line number Diff line number Diff line
@@ -693,3 +693,8 @@ INSERT INTO t1 VALUES ('one'),('two'); 
SELECT CHARSET('a');

SELECT user, CONCAT('<', user, '>') AS c FROM t1;

DROP TABLE t1;



#

# Bug#8385: utf8_general_ci treats Cyrillic letters I and SHORT I as the same

#

select convert(_koi8r'' using utf8) < convert(_koi8r'' using utf8);

mysys/charset.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static my_bool init_state_maps(CHARSET_INFO *cs) 
    else if (my_mbcharlen(cs, i)>1)

      state_map[i]=(uchar) MY_LEX_IDENT;

#endif

    else if (!my_isgraph(cs,i))

    else if (my_isspace(cs,i))

      state_map[i]=(uchar) MY_LEX_SKIP;

    else

      state_map[i]=(uchar) MY_LEX_CHAR;