diff options
| author | unknown <reggie@mdk10.(none)> | 2005-04-11 09:29:49 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-04-11 09:29:49 -0500 |
| commit | c026b4f7f4523878e5dc2d2ce24261f22323d8e6 (patch) | |
| tree | 71d2ee8bc97f321c7a5d0bf9b826b26f696f436c /mysql-test/r/query_cache.result | |
| parent | d068b068c8d2253b29ec43060f5b5090cf5f67db (diff) | |
| parent | cd0ceaf8c8adfed93f4a3517f75478a27c35bd8e (diff) | |
| download | mariadb-git-c026b4f7f4523878e5dc2d2ce24261f22323d8e6.tar.gz | |
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-5.0
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/item_create.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/query_cache.result')
| -rw-r--r-- | mysql-test/r/query_cache.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 6863534b2d8..8db57104477 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -299,6 +299,8 @@ select UNIX_TIMESTAMP() from t1; UNIX_TIMESTAMP() select USER() from t1; USER() +select CURRENT_USER() from t1; +CURRENT_USER() select benchmark(1,1) from t1; benchmark(1,1) explain extended select benchmark(1,1) from t1; |