diff options
| author | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-11-28 10:55:13 +0400 |
|---|---|---|
| committer | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2007-11-28 10:55:13 +0400 |
| commit | 75095711f49bb77c4d7d56108449728c863b6007 (patch) | |
| tree | fcce6bdeb9122a8407d2055a7a871c7e9523613d /strings | |
| parent | 2cc3e56ea410953dfa0c958fe310a896aa8d854d (diff) | |
| download | mariadb-git-75095711f49bb77c4d7d56108449728c863b6007.tar.gz | |
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.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-cp932.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |