summaryrefslogtreecommitdiff
path: root/mysql-test/r/olap.result
diff options
context:
space:
mode:
authorgkodinov@dl145s.mysql.com <>2006-09-18 12:57:20 +0200
committergkodinov@dl145s.mysql.com <>2006-09-18 12:57:20 +0200
commitce8ed889d70c63332ba1f8317baf9d6a91cf7cbe (patch)
tree5370a5cf6745df5fd6690197a45f08ce5e60daf1 /mysql-test/r/olap.result
parent343e08391d70accf2d2c9f077b3e950b53ea05fe (diff)
parent2ec485f06eb5cdf8a38c6192690ae29045181a72 (diff)
downloadmariadb-git-ce8ed889d70c63332ba1f8317baf9d6a91cf7cbe.tar.gz
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
Diffstat (limited to 'mysql-test/r/olap.result')
-rw-r--r--mysql-test/r/olap.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result
index 993426a02fc..f9e211c8186 100644
--- a/mysql-test/r/olap.result
+++ b/mysql-test/r/olap.result
@@ -611,7 +611,7 @@ C
NULL
EXPLAIN SELECT type FROM v1 GROUP BY type WITH ROLLUP;
id select_type table type possible_keys key key_len ref rows Extra
-1 PRIMARY t1 ALL NULL NULL NULL NULL 10 Using filesort
+1 SIMPLE t1 ALL NULL NULL NULL NULL 10 Using filesort
DROP VIEW v1;
DROP TABLE t1;
CREATE TABLE t1 (a int(11) NOT NULL);