diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-08 13:50:58 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-08 13:53:21 +0200 |
commit | be6307c0fa434298a485665e7808a7ebfa027f8c (patch) | |
tree | 01798de92165b5dee014aa61df20f0b4bdecb63b /mysys/ma_dyncol.c | |
parent | 5c057b3fef3aa92cfadbd63043799b430132a494 (diff) | |
parent | 871f2a6ee29a28dbaa6e81c616835d37622d398f (diff) | |
download | mariadb-git-be6307c0fa434298a485665e7808a7ebfa027f8c.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'mysys/ma_dyncol.c')
-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 2e00ca72f74..fb163899a76 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) { |