diff options
| author | unknown <kostja@bodhi.local> | 2006-07-13 11:43:52 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-13 11:43:52 +0400 |
| commit | d013f9e53ac855c15279385489660dbe15cb0ec2 (patch) | |
| tree | 89fcc7cfa6078548d86b4bbdc2e9d98f72755958 /mysql-test/r/func_system.result | |
| parent | 26f0d13d0163beba2ae4f96396302b0c44407c65 (diff) | |
| parent | a4e5d04db42bf492e2dc3af1ad11bc883959f50d (diff) | |
| download | mariadb-git-d013f9e53ac855c15279385489660dbe15cb0ec2.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
include/my_sys.h:
Auto merged
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/func_system.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/slave.h:
SCCS merged
mysql-test/r/show_check.result:
Manual merge.
mysql-test/t/show_check.test:
Manual merge.
sql/log_event.cc:
Manual merge.
sql/share/errmsg.txt:
Manual merge.
sql/sql_class.h:
Manual merge.
sql/sql_db.cc:
Manual merge.
Diffstat (limited to 'mysql-test/r/func_system.result')
| -rw-r--r-- | mysql-test/r/func_system.result | 2 |
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 |