diff options
| author | unknown <bar@mysql.com> | 2005-08-12 17:10:00 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-08-12 17:10:00 +0500 |
| commit | 8685497a3f2467fb3929d633d5104782142c5362 (patch) | |
| tree | 837691783e69d447d573b714d65381b20a31dd69 /mysql-test/r/func_system.result | |
| parent | 36283ca2f09569fa1f1c7aabfcce4a188a17ad60 (diff) | |
| parent | 058d5bff6e73eb4b9b36cb0bb82687557e3c317d (diff) | |
| download | mariadb-git-8685497a3f2467fb3929d633d5104782142c5362.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b12351
into mysql.com:/usr/home/bar/mysql-5.0
client/mysqlcheck.c:
Auto merged
mysql-test/r/func_system.result:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/func_system.result')
| -rw-r--r-- | mysql-test/r/func_system.result | 15 |
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 |