summaryrefslogtreecommitdiff
path: root/include/ma_dyncol.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2018-01-22 16:53:10 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2018-01-23 13:06:39 +0100
commita4663af05c1d1bd3abb537205df070ed2158e702 (patch)
tree935bf4702fc478f5ecb60c9194d37108161d5e13 /include/ma_dyncol.h
parentea78c5744b958ddcd6946faf5ca24f115275a366 (diff)
downloadmariadb-git-a4663af05c1d1bd3abb537205df070ed2158e702.tar.gz
MDEV-7533: COLUMN_JSON() doesn't escape control characters in string values
escape all charecters less or equal 0x1F (control symbols) (shorter sequence are not used to make code simple, long encoding is always legal according to the rfc4627)
Diffstat (limited to 'include/ma_dyncol.h')
-rw-r--r--include/ma_dyncol.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ma_dyncol.h b/include/ma_dyncol.h
index 300474e061e..4f05b425afd 100644
--- a/include/ma_dyncol.h
+++ b/include/ma_dyncol.h
@@ -69,6 +69,9 @@ typedef struct st_mysql_lex_string LEX_STRING;
#define DYNCOL_UTF (&my_charset_utf8_general_ci)
#endif
+/* escape json strings */
+#define DYNCOL_JSON_ESC ((char)1)
+
enum enum_dyncol_func_result
{
ER_DYNCOL_OK= 0,