From 3f42e6ff9b98ebefdb684c0370872cb98f3a5aa2 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 28 Nov 2007 10:55:13 +0400 Subject: Fix for bug #32726: crash with cast in order by clause and cp932 charset - fix for #31070 (missed during merging) applied for cp932 charset. - tests/results adjusted. mysql-test/include/ctype_common.inc: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_big5.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_cp932.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_euckr.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_gb2312.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_gbk.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/r/ctype_uca.result: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. mysql-test/t/ctype_cp932.test: Fix for bug #32726: crash with cast in order by clause and cp932 charset - tests/results adjusted. strings/ctype-cp932.c: Fix for bug #32726: crash with cast in order by clause and cp932 charset - fix for #31070 (missed during merging) applied for cp932. --- strings/ctype-cp932.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'strings') diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c index 42325648037..48c217921b1 100644 --- a/strings/ctype-cp932.c +++ b/strings/ctype-cp932.c @@ -5359,12 +5359,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; -- cgit v1.2.1