summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_system.result
diff options
context:
space:
mode:
authorbar@mysql.com <>2005-08-12 17:10:00 +0500
committerbar@mysql.com <>2005-08-12 17:10:00 +0500
commit1b50f35ab2df034b015796c7c813e08be3d9259c (patch)
tree837691783e69d447d573b714d65381b20a31dd69 /mysql-test/r/func_system.result
parent3f1f7102caf120c8ac0fc23eddce5c6ab0554209 (diff)
parentfd7ad7f16f9184cd15708a2ef20ad7be98c6718f (diff)
downloadmariadb-git-1b50f35ab2df034b015796c7c813e08be3d9259c.tar.gz
Merge mysql.com:/usr/home/bar/mysql-4.1.b12351
into mysql.com:/usr/home/bar/mysql-5.0
Diffstat (limited to 'mysql-test/r/func_system.result')
-rw-r--r--mysql-test/r/func_system.result15
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result
index 5ec5d7d724e..1c1c6dff21e 100644
--- a/mysql-test/r/func_system.result
+++ b/mysql-test/r/func_system.result
@@ -68,6 +68,21 @@ drop table t1;
select TRUE,FALSE,NULL;
TRUE FALSE NULL
1 0 NULL
+create table t1 (c1 char(5)) character set=latin1;
+insert into t1 values('row 1');
+insert into t1 values('row 2');
+insert into t1 values('row 3');
+select concat(user(), '--', c1) from t1;
+concat(user(), '--', c1)
+root@localhost--row 1
+root@localhost--row 2
+root@localhost--row 3
+select concat(database(), '--', c1) from t1;
+concat(database(), '--', c1)
+test--row 1
+test--row 2
+test--row 3
+drop table t1;
create table t1 (a char(10)) character set latin1;
select * from t1 where a=version();
a