mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 09:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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.
This commit is contained in:
unknown 2006-03-23 14:14:32 +04:00
commit 86f3d2d08a
24 changed files with 158 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
strings/ctype-bin.c
View file

@ -246,7 +246,7 @@ static int my_mb_wc_bin(CHARSET_INFO *cs __attribute__((unused)),
const unsigned char *end __attribute__((unused)))
{
if (str >= end)
return MY_CS_TOOFEW(0);
return MY_CS_TOOSMALL;
*wc=str[0];
return 1;