database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/ram/work/b32726/b32726.5.0

Browse Source 
into  mysql.com:/home/ram/work/b32726/b32726.5.1


mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
  Auto merged
This commit is contained in:
unknown
2007-11-29 14:35:15 +04:00
parent b9c4817058 3f42e6ff9b
commit d68d16bb3d
9 changed files with 102 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
strings/ctype-cp932.c
View File

@ -5360,12 +5360,12 @@ my_wc_mb_cp932(CHARSET_INFO *cs __attribute__((unused)),
static int
my_mb_wc_cp932(CHARSET_INFO *cs __attribute__((unused)),
my_wc_t *pwc, const uchar *s, const uchar *e){
int hi=s[0];
int hi;
if (s >= e)
return MY_CS_TOOSMALL;
if (hi < 0x80)
if ((hi= s[0]) < 0x80)
{
pwc[0]=hi;
return 1;