diff options
| author | unknown <evgen@sunlight.local> | 2006-08-01 09:24:19 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-08-01 09:24:19 +0400 |
| commit | deee3a30d61990d5c4b4e8abdab8102f28710d18 (patch) | |
| tree | 175eff6178bdfc623e26353bfcc955d7997c6025 /mysql-test/r/func_system.result | |
| parent | f75e79e0fc5f965b4f108a36441205ba4e35fd61 (diff) | |
| parent | 9f90d4c2243790b103c7340ecbd2f9cd0bcfb380 (diff) | |
| download | mariadb-git-deee3a30d61990d5c4b4e8abdab8102f28710d18.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
mysql-test/r/auto_increment.result:
Auto merged
mysql-test/r/binlog_row_blackhole.result:
Auto merged
mysql-test/r/binlog_stm_blackhole.result:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_compress.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/func_system.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/group_min_max.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/r/partition_pruning.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_get_lock.result:
Auto merged
mysql-test/r/rpl_master_pos_wait.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/group_min_max.test:
Auto merged
mysql-test/t/partition_pruning.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
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 2035f4219e0..fa05021eb47 100644 --- a/mysql-test/r/func_system.result +++ b/mysql-test/r/func_system.result @@ -38,8 +38,8 @@ select charset(version()); charset(version()) utf8 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 +id select_type table type possible_keys key key_len ref rows filtered Extra +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: Note 1003 select database() AS `database()`,user() AS `user()` create table t1 (version char(60)) select database(), user(), version() as 'version'; |