2 files changed, 64 insertions, 4 deletions
diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result
index 83e78a30396..15ff34a6d80 100644
--- a/mysql-test/r/func_system.result
+++ b/mysql-test/r/func_system.result
@@ -1,9 +1,51 @@
-select database(),user() like "%@%";
-database()	user() like "%@%"
-test	1
+select database();
+database()
+test
+select charset(database());
+charset(database())
+utf8
+select database() = "test";
+database() = "test"
+1
+select database() = _utf8"test";
+database() = _utf8"test"
+1
+select database() = _latin1"test";
+database() = _latin1"test"
+1
+select user() like "%@%";
+user() like "%@%"
+1
+select user() like _utf8"%@%";
+user() like _utf8"%@%"
+1
+select user() like _latin1"%@%";
+user() like _latin1"%@%"
+1
+select charset(user());
+charset(user())
+utf8
+select version()>="3.23.29";
+version()>="3.23.29"
+1
 select version()>=_utf8"3.23.29";
 version()>=_utf8"3.23.29"
 1
+select version()>=_latin1"3.23.29";
+version()>=_latin1"3.23.29"
+1
+select charset(version());
+charset(version())
+utf8
+create table t1 select database(), user(), version();
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `database()` char(102) character set utf8 NOT NULL default '',
+  `user()` char(231) character set utf8 NOT NULL default '',
+  `version()` char(21) character set utf8 NOT NULL default ''
+) TYPE=MyISAM CHARSET=latin1
+drop table t1;
 select TRUE,FALSE,NULL;
 TRUE	FALSE	NULL
 1	0	NULL
diff --git a/mysql-test/t/func_system.test b/mysql-test/t/func_system.test
index db366e3ab49..41b776719dc 100644
--- a/mysql-test/t/func_system.test
+++ b/mysql-test/t/func_system.test
@@ -2,6 +2,24 @@
 # system functions
 #
 
-select database(),user() like "%@%";
+select database();
+select charset(database());
+select database() = "test";
+select database() = _utf8"test";
+select database() = _latin1"test";
+
+select user() like "%@%";
+select user() like _utf8"%@%";
+select user() like _latin1"%@%";
+select charset(user());
+
+select version()>="3.23.29";
 select version()>=_utf8"3.23.29";
+select version()>=_latin1"3.23.29";
+select charset(version());
+
+create table t1 select database(), user(), version();
+show create table t1;
+drop table t1;
+
 select TRUE,FALSE,NULL;