UUID() function should return UUID, not VARCHAR(36)

8 files changed, 13 insertions, 9 deletions

diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result
index 1d0227e8cf6..b6cd1fff6fd 100644
--- a/mysql-test/main/ctype_utf8.result
+++ b/mysql-test/main/ctype_utf8.result
@@ -11392,8 +11392,8 @@ DROP TABLE t1;
 # MDEV-20890 Illegal mix of collations with UUID()
 #
 SET NAMES utf8 COLLATE utf8_unicode_ci;
-SELECT uuid()>'';
-uuid()>''
+SELECT sys_guid()>'';
+sys_guid()>''
 1
 #
 # MDEV-8844 Unreadable control characters printed as is in warnings
diff --git a/mysql-test/main/ctype_utf8.test b/mysql-test/main/ctype_utf8.test
index 6febc42085a..daef581fa02 100644
--- a/mysql-test/main/ctype_utf8.test
+++ b/mysql-test/main/ctype_utf8.test
@@ -2319,7 +2319,7 @@ DROP TABLE t1;
 --echo #
 
 SET NAMES utf8 COLLATE utf8_unicode_ci;
-SELECT uuid()>'';
+SELECT sys_guid()>'';
 
 
 --echo #
diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result
index 6edb27c14b8..29b996f3066 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.
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test
index e62c780702f..eb84d607430 100644
--- a/mysql-test/main/func_json.test
+++ b/mysql-test/main/func_json.test
@@ -429,7 +429,7 @@ DROP TABLE t1;
 --echo # MDEV-16054 simple json functions flatline cpu on garbage input.
 --echo #
 
-select json_array(1,uuid(),compress(5.140264e+307));
+select json_array(1,user(),compress(5.140264e+307));
 
 --echo #
 --echo # MDEV-16869 String functions don't respect character set of JSON_VALUE.
diff --git a/mysql-test/main/func_misc.result b/mysql-test/main/func_misc.result
index b2c08989854..7597da95f3d 100644
--- a/mysql-test/main/func_misc.result
+++ b/mysql-test/main/func_misc.result
@@ -118,9 +118,12 @@ create table t1 as select uuid(), length(uuid());
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `uuid()` varchar(36) DEFAULT NULL,
+  `uuid()` uuid DEFAULT NULL,
   `length(uuid())` int(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
+select length(`uuid()`) from t1;
+length(`uuid()`)
+36
 drop table t1;
 create table t1 select INET_ATON('255.255.0.1') as `a`;
 show create table t1;
diff --git a/mysql-test/main/func_misc.test b/mysql-test/main/func_misc.test
index 56e7a996f94..5e8118d4cef 100644
--- a/mysql-test/main/func_misc.test
+++ b/mysql-test/main/func_misc.test
@@ -106,6 +106,7 @@ select export_set(3, _latin1'foo', _utf8'bar', ',', 4);
 create table t1 as select uuid(), length(uuid());
 --enable_warnings
 show create table t1;
+select length(`uuid()`) from t1;
 drop table t1;
 
 #
diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result
index d44f634db08..7bca4158d70 100644
--- a/mysql-test/main/func_time.result
+++ b/mysql-test/main/func_time.result
@@ -2792,7 +2792,7 @@ SET sql_mode=DEFAULT;
 #
 # MDEV-13972 crash in Item_func_sec_to_time::get_date
 #
-DO TO_DAYS(SEC_TO_TIME(TIME(CEILING(UUID()))));
+DO TO_DAYS(SEC_TO_TIME(TIME(CEILING(SYS_GUID()))));
 DO TO_DAYS(SEC_TO_TIME(MAKEDATE('',RAND(~('')))));
 Warnings:
 Warning	1292	Truncated incorrect DECIMAL value: ''
diff --git a/mysql-test/main/func_time.test b/mysql-test/main/func_time.test
index f0bfb926f83..359b1ac8698 100644
--- a/mysql-test/main/func_time.test
+++ b/mysql-test/main/func_time.test
@@ -1701,7 +1701,7 @@ SET sql_mode=DEFAULT;
 
 # The below query can return warning sporadically
 --disable_warnings
-DO TO_DAYS(SEC_TO_TIME(TIME(CEILING(UUID()))));
+DO TO_DAYS(SEC_TO_TIME(TIME(CEILING(SYS_GUID()))));
 --enable_warnings
 
 DO TO_DAYS(SEC_TO_TIME(MAKEDATE('',RAND(~('')))));