diff options
| author | unknown <bar@mysql.com> | 2005-04-06 15:12:44 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-04-06 15:12:44 +0500 |
| commit | 3683fc3453ad0fdd0f0437aaf562dd19a2defa5a (patch) | |
| tree | ffab232fafade80d54e8318a2f471935917df81a /strings/ctype-mb.c | |
| parent | 97b26d3b93abef87bc6918af326202467212e103 (diff) | |
| download | mariadb-git-3683fc3453ad0fdd0f0437aaf562dd19a2defa5a.tar.gz | |
Minor clean-ups for the previous commit.
sql/field.cc:
Use a separate variable. Otherwise "error" value gets lost
after well_formed_length call.
strings/ctype-mb.c:
Don't return an error if we reached end of line.
Diffstat (limited to 'strings/ctype-mb.c')
| -rw-r--r-- | strings/ctype-mb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c index dbe3a24324e..cbbd035c631 100644 --- a/strings/ctype-mb.c +++ b/strings/ctype-mb.c @@ -276,7 +276,7 @@ uint my_well_formed_len_mb(CHARSET_INFO *cs, const char *b, const char *e, if ((mblen= cs->cset->mb_wc(cs, &wc, (uchar*) b, (uchar*) e)) <= 0) { - *error= 1; + *error= b < e ? 1 : 0; break; } b+= mblen; |