diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-08 13:29:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-08 13:29:08 +0200 |
| commit | 871f2a6ee29a28dbaa6e81c616835d37622d398f (patch) | |
| tree | 88688257439eaeb3a5118f0c05598d430f61bd37 /mysys | |
| parent | b253a0c3a90818611b0854fb6c1edc5c458a8398 (diff) | |
| parent | 9216a4f69f113390cc55bd9c58c9f347ef4321c7 (diff) | |
| download | mariadb-git-871f2a6ee29a28dbaa6e81c616835d37622d398f.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/ma_dyncol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c index 1c5a4152292..53edfc5d87b 100644 --- a/mysys/ma_dyncol.c +++ b/mysys/ma_dyncol.c @@ -3833,7 +3833,7 @@ my_bool dynstr_append_json_quoted(DYNAMIC_STRING *str, for (i= 0; i < len; i++) { register char c= append[i]; - if (unlikely(c <= 0x1F)) + if (unlikely(((uchar)c) <= 0x1F)) { if (lim < 5) { |