Commit 8c8e0567 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1.b15376 

into  mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
sql/sql_string.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.
mysql-test/r/ctype_ujis.result:
  After merge fix
parents 5b34888c a464e017

include/m_ctype.h

+14 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ typedef struct unicase_info_st 
  uint16 sort;

} MY_UNICASE_INFO;





extern MY_UNICASE_INFO *my_unicase_default[256];

extern MY_UNICASE_INFO *my_unicase_turkish[256];
@@ -52,6 +53,19 @@ extern MY_UNICASE_INFO *my_unicase_turkish[256]; 
#define MY_CS_TOOSMALL	-1

#define MY_CS_TOOFEW(n)	(-1-(n))



/* wm_wc and wc_mb return codes */

#define MY_CS_ILSEQ	0     /* Wrong by sequence: wb_wc                   */

#define MY_CS_ILUNI	0     /* Cannot encode Unicode to charset: wc_mb    */

#define MY_CS_TOOSMALL  -101  /* Need at least one byte:    wc_mb and mb_wc */

#define MY_CS_TOOSMALL2 -102  /* Need at least two bytes:   wc_mb and mb_wc */

#define MY_CS_TOOSMALL3 -103  /* Need at least three bytes: wc_mb and mb_wc */

/* These following three are currently not really used */

#define MY_CS_TOOSMALL4 -104  /* Need at least 4 bytes: wc_mb and mb_wc */

#define MY_CS_TOOSMALL5 -105  /* Need at least 5 bytes: wc_mb and mb_wc */

#define MY_CS_TOOSMALL6 -106  /* Need at least 6 bytes: wc_mb and mb_wc */

/* A helper macros for "need at least n bytes" */

#define MY_CS_TOOSMALLN(n)    (-100-(n))



#define MY_SEQ_INTTAIL	1

#define MY_SEQ_SPACES	2

mysql-test/r/ctype_big5.result

+3 −0
Original line number Diff line number Diff line
@@ -189,3 +189,6 @@ select hex(a) from t1 where a = _big5 0xF9DC; 
hex(a)

E5ABBA

drop table t1;

select hex(convert(_big5 0xC84041 using ucs2));

hex(convert(_big5 0xC84041 using ucs2))

003F0041

mysql-test/r/ctype_gbk.result

+3 −0
Original line number Diff line number Diff line
@@ -165,3 +165,6 @@ hex(a) 
A1A1

A3A0

DROP TABLE t1;

select hex(convert(_gbk 0xA14041 using ucs2));

hex(convert(_gbk 0xA14041 using ucs2))

003F0041

mysql-test/r/ctype_ujis.result

+6 −0
Original line number Diff line number Diff line
@@ -2337,3 +2337,9 @@ DROP TABLE t2; 
set names default;

set character_set_database=default;

set character_set_server=default;

select hex(convert(_ujis 0xA5FE41 using ucs2));

hex(convert(_ujis 0xA5FE41 using ucs2))

003F0041

select hex(convert(_ujis 0x8FABF841 using ucs2));

hex(convert(_ujis 0x8FABF841 using ucs2))

003F0041

mysql-test/t/ctype_big5.test

+10 −0
Original line number Diff line number Diff line
@@ -53,4 +53,14 @@ alter table t1 convert to character set utf8; 
select hex(a) from t1 where a = _big5 0xF9DC;

drop table t1;



#

# Bugs#15375: Unassigned multibyte codes are broken

# into parts when converting to Unicode.

# This query should return 0x003F0041. I.e. it should

# scan unassigned double-byte character 0xC840, convert

# it as QUESTION MARK 0x003F and then scan the next

# character, which is a single byte character 0x41.

#

select hex(convert(_big5 0xC84041 using ucs2));



# End of 4.1 tests