summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_system.result
diff options
context:
space:
mode:
authorkostja@bodhi.local <>2006-07-13 11:43:52 +0400
committerkostja@bodhi.local <>2006-07-13 11:43:52 +0400
commit99fefab169bdfdf9d2759e9bbecb81772f21826b (patch)
tree89fcc7cfa6078548d86b4bbdc2e9d98f72755958 /mysql-test/r/func_system.result
parent56353959e7cbc40396f3e4cc3b34c6ca5fdd64dd (diff)
parent3010430ddf21d377a7871cd849fa9e44fae8fe50 (diff)
downloadmariadb-git-99fefab169bdfdf9d2759e9bbecb81772f21826b.tar.gz
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
Diffstat (limited to 'mysql-test/r/func_system.result')
-rw-r--r--mysql-test/r/func_system.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result
index e186afdfafa..2035f4219e0 100644
--- a/mysql-test/r/func_system.result
+++ b/mysql-test/r/func_system.result
@@ -41,7 +41,7 @@ explain extended select database(), user();
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used
Warnings:
-Note 1003 select sql_no_cache database() AS `database()`,user() AS `user()`
+Note 1003 select database() AS `database()`,user() AS `user()`
create table t1 (version char(60)) select database(), user(), version() as 'version';
show create table t1;
Table Create Table