summaryrefslogtreecommitdiff
path: root/mysql-test/r/partition.result
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2011-01-10 15:08:31 +0100
committerMattias Jonsson <mattias.jonsson@oracle.com>2011-01-10 15:08:31 +0100
commitb56308e63d74c619c4fe8b765c3745e728d804c8 (patch)
tree23ed20d7372307636b325211cd801777b7e6e0d0 /mysql-test/r/partition.result
parenta5263d0afb65fabc98cea354e3e5769f1f2b942e (diff)
parent2f4741667867accad41d6b2d2a9ac67851ad35c0 (diff)
downloadmariadb-git-b56308e63d74c619c4fe8b765c3745e728d804c8.tar.gz
Manual merge from 5.1
Diffstat (limited to 'mysql-test/r/partition.result')
-rw-r--r--mysql-test/r/partition.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index a639f9e6b3b..9c8b93d9fe2 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -1901,7 +1901,7 @@ c1 bigint,
c2 set('sweet'),
key (c2,c1,c0),
key(c0)
-) engine=myisam partition by hash (month(c0)) partitions 5;
+) engine=myisam partition by hash (c0) partitions 5;
insert ignore into t1 set c0 = -6502262, c1 = 3992917, c2 = 35019;
insert ignore into t1 set c0 = 241221, c1 = -6862346, c2 = 56644;
select c1 from t1 group by (select c0 from t1 limit 1);