summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-07-03 16:22:30 +0200
committerSergei Golubchik <serg@mariadb.org>2017-07-05 17:15:59 +0200
commit1ea3c93fda52d2c154811e19853cff89342006a6 (patch)
tree7a91ad983a877b55ff113891d106157fb2bac99b /sql
parent51d457f371ddf2191f48ec197e8f7364cfa071c8 (diff)
downloadmariadb-git-1ea3c93fda52d2c154811e19853cff89342006a6.tar.gz
MDEV-9144 JSON data type
for compatibility with MySQL, add 'JSON' as an alias for 'TEXT'
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_yacc.yy2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index b52301943fb..2d692e9e53b 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -6478,6 +6478,8 @@ field_type:
{ $$.set(MYSQL_TYPE_SET); }
| LONG_SYM opt_binary
{ $$.set(MYSQL_TYPE_MEDIUM_BLOB); }
+ | JSON_SYM opt_binary
+ { $$.set(MYSQL_TYPE_BLOB); }
;
spatial_type: