diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-14 09:12:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-14 09:12:47 +0300 |
| commit | 348eaf425216fe927424220b1820da0e383cfa52 (patch) | |
| tree | fb24590627585a4aeab98bbe1b7a1f77bd8d63d5 /strings | |
| parent | 474f51711b1abbba799d93a0223ef38316b78f6c (diff) | |
| parent | 2bd6ccae72306547fc89199342584cd4d6e9b939 (diff) | |
| download | mariadb-git-348eaf425216fe927424220b1820da0e383cfa52.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/json_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c index ebbf45fc668..239e0b31732 100644 --- a/strings/json_lib.c +++ b/strings/json_lib.c @@ -1584,7 +1584,7 @@ int json_escape(CHARSET_INFO *str_cs, enum json_esc_char_classes c_class; str+= c_len; - if (c_chr > 0x60 || (c_class= json_escape_chr_map[c_chr]) == ESC_) + if (c_chr >= 0x60 || (c_class= json_escape_chr_map[c_chr]) == ESC_) { if ((c_len= json_cs->cset->wc_mb(json_cs, c_chr, json, json_end)) > 0) { |