MDEV-11468 JSON_UNQUOTE returns incorrect results.

Now return the argument's value when error.
MariaDB · Dec 5, 2016 · 3743b4c · 3743b4c
1 parent 0009f4a
commit 3743b4c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/mysql-test/r/func_json.result b/mysql-test/r/func_json.result
@@ -277,6 +277,9 @@ drop table t1;
 select json_unquote('"abc"');
 json_unquote('"abc"')
 abc
+select json_unquote('abc');
+json_unquote('abc')
+abc
 select json_object("a", json_object("b", "abcd"));
 json_object("a", json_object("b", "abcd"))
 {"a": {"b": "abcd"}}

diff --git a/mysql-test/t/func_json.test b/mysql-test/t/func_json.test
@@ -121,6 +121,7 @@ drop table t1;
 
 
 select json_unquote('"abc"');
+select json_unquote('abc');
 
 select json_object("a", json_object("b", "abcd"));
 select json_object("a", '{"b": "abcd"}');

diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc
@@ -359,8 +359,8 @@ String *Item_func_json_unquote::val_str(String *str)
   return str;
 
 error:
-  null_value= 1;
-  return 0;
+  /* We just return the argument's value in the case of error. */
+  return js;
 }