diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-03-21 15:09:40 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-03-21 15:09:40 +0400 |
| commit | c2df88fa2284bc70f135bb20e509ff1bc3cfdecf (patch) | |
| tree | 61ccee38b096959caf860d1f7f6eeefedc3182c7 | |
| parent | c3329ed674d97a32989d7b99fbb3b7e8c05da949 (diff) | |
| parent | 75ad5e96e1d7b504e7a0372fd8632c047ac2336f (diff) | |
| download | mariadb-git-c2df88fa2284bc70f135bb20e509ff1bc3cfdecf.tar.gz | |
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
| -rw-r--r-- | mysql-test/t/innodb.test | 2 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index c85f2192437..0a10df52412 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -49,7 +49,7 @@ select * from t1 where parent_id=102; explain select level from t1 where level=1; --replace_result 12 # 6 # explain select level,id from t1 where level=1; ---replace_result 12 # 6 # +--replace_result 12 # 6 # 5 # explain select level,id,parent_id from t1 where level=1; select level,id from t1 where level=1; select level,id,parent_id from t1 where level=1; diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 897e2846659..702a34fde84 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1585,14 +1585,15 @@ static uchar to_upper_utf8[] = { }; -static int my_utf8_uni (CHARSET_INFO *cs __attribute__((unused)) , - my_wc_t * pwc, const uchar *s, const uchar *e) +static int my_utf8_uni(CHARSET_INFO *cs __attribute__((unused)), + my_wc_t * pwc, const uchar *s, const uchar *e) { - unsigned char c = s[0]; + unsigned char c; if (s >= e) return MY_CS_TOOFEW(0); + c= s[0]; if (c < 0x80) { *pwc = c; @@ -1624,10 +1625,8 @@ static int my_utf8_uni (CHARSET_INFO *cs __attribute__((unused)) , (my_wc_t) (s[2] ^ 0x80); return 3; - -#ifdef UNICODE_32BIT - } +#ifdef UNICODE_32BIT else if (c < 0xf8 && sizeof(my_wc_t)*8 >= 32) { if (s+4 > e) /* We need 4 characters */ @@ -1685,9 +1684,9 @@ static int my_utf8_uni (CHARSET_INFO *cs __attribute__((unused)) , | ((my_wc_t) (s[4] ^ 0x80) << 6) | (my_wc_t) (s[5] ^ 0x80); return 6; + } #endif - } else - return MY_CS_ILSEQ; + return MY_CS_ILSEQ; } static int my_uni_utf8 (CHARSET_INFO *cs __attribute__((unused)) , |