diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-08 05:36:35 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-08 05:36:35 +0300 |
| commit | 515c747dcfcca8d04a509496c5864f302d6d76be (patch) | |
| tree | 87a4027a65ad98a422987c566b6d394464e95623 /mysql-test/r/func_system.result | |
| parent | 41972bea9234345ed36ea92d40c0b0cf3ec315b0 (diff) | |
| parent | cef1d752497f81229788e56abaf7fa62c1ab31a9 (diff) | |
| download | mariadb-git-515c747dcfcca8d04a509496c5864f302d6d76be.tar.gz | |
merge
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/count_distinct2.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
libmysqld/Makefile.am:
Added back md5.c
Diffstat (limited to 'mysql-test/r/func_system.result')
| -rw-r--r-- | mysql-test/r/func_system.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result index 78a084de8d3..175524f6b83 100644 --- a/mysql-test/r/func_system.result +++ b/mysql-test/r/func_system.result @@ -1,6 +1,6 @@ -select database(),user(); +select database(),user() like "%@%"; database() user() -test root@localhost +test 1 select version()>="3.23.29"; version()>="3.23.29" 1 |