summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-01-06 13:31:31 +0200
committerunknown <monty@mysql.com>2005-01-06 13:31:31 +0200
commit8ff8867251ccfefed1785efb50e56bc80aaf7663 (patch)
tree88cf38e01d5a6bd71bad06acf244a51bbed77d4f /mysql-test/r
parent9bb865befc8510e13ad5b231b1fd4888e36b6041 (diff)
parentacf76e3b88b4ec294c8f63f0fb2a29f895228259 (diff)
downloadmariadb-git-8ff8867251ccfefed1785efb50e56bc80aaf7663.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0 sql/item_func.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/group_min_max.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result
index 006e7052376..c7be93b0fd7 100644
--- a/mysql-test/r/group_min_max.result
+++ b/mysql-test/r/group_min_max.result
@@ -148,7 +148,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range NULL idx_t1_1 147 NULL 17 Using index for group-by
explain select a1,a2,b,max(c),min(c) from t2 group by a1,a2,b;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t2 range NULL idx_t2_1 163 NULL 21 Using index for group-by
+1 SIMPLE t2 range NULL idx_t2_1 # NULL 21 Using index for group-by
explain select min(a2), a1, max(a2), min(a2), a1 from t1 group by a1;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range NULL idx_t1_1 65 NULL 5 Using index for group-by