summaryrefslogtreecommitdiff
path: root/mysql-test/main/func_json.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-08-10 12:21:08 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2022-08-10 12:21:08 +0200
commit65e8506ca9d03967191b6ed207cf107d311f7f99 (patch)
tree3076ff798884b52655a5961be21e799708a4b628 /mysql-test/main/func_json.result
parent6adfce9c8d2a63a259dd0504600271498dcda228 (diff)
parentfaddcf3c395da640b760c3f701f5bc1f3baae6c4 (diff)
downloadmariadb-git-65e8506ca9d03967191b6ed207cf107d311f7f99.tar.gz
Merge branch '10.3' into bb-10.4-releasemariadb-10.4.26
Diffstat (limited to 'mysql-test/main/func_json.result')
-rw-r--r--mysql-test/main/func_json.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result
index b31aed1fe01..a25c0514382 100644
--- a/mysql-test/main/func_json.result
+++ b/mysql-test/main/func_json.result
@@ -765,8 +765,8 @@ DROP TABLE t1;
#
# MDEV-16054 simple json functions flatline cpu on garbage input.
#
-select json_array(1,uuid(),compress(5.140264e+307));
-json_array(1,uuid(),compress(5.140264e+307))
+select json_array(1,user(),compress(5.140264e+307));
+json_array(1,user(),compress(5.140264e+307))
NULL
#
# MDEV-16869 String functions don't respect character set of JSON_VALUE.