Commit 86f3d2d0 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.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.
parents c7df2c6a 1b58717c

include/m_ctype.h

+13 −4
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];
@@ -56,10 +57,18 @@ typedef struct uni_ctype_st 
extern MY_UNI_CTYPE my_uni_ctype[256];





#define MY_CS_ILSEQ	0

#define MY_CS_ILUNI	0

#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_eucjpms.result

+6 −0
Original line number Diff line number Diff line
@@ -9819,3 +9819,9 @@ eucjpms_bin 6109 
eucjpms_bin	61

eucjpms_bin	6120

drop table t1;

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

hex(convert(_eucjpms 0xA5FE41 using ucs2))

003F0041

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

hex(convert(_eucjpms 0x8FABF841 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
@@ -2307,6 +2307,12 @@ select c1 as c2h from t1 where c1 like 'ab#_def' escape '#'; 
c2h

ab_def

drop table t1;

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

DROP TABLE IF EXISTS t1, t2;

DROP PROCEDURE IF EXISTS sp1;

set names ujis;