From 790dd097c3942ee0962eabcf571364bdd81efb61 Mon Sep 17 00:00:00 2001
From: Mattias Jonsson <mattias.jonsson@oracle.com>
Date: Fri, 1 Oct 2010 18:10:45 +0200
Subject: [PATCH] minor test result update after merge

---
 mysql-test/r/partition_error.result | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/partition_error.result b/mysql-test/r/partition_error.result
index 830ca4bee10..a1e95727235 100644
--- a/mysql-test/r/partition_error.result
+++ b/mysql-test/r/partition_error.result
@@ -72,6 +72,8 @@ a
 2000-01-02 03:04:05
 2001-02-03 04:05:06
 ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
+Warnings:
+Warning	1486	Constant, random or timezone-dependent expressions in (sub)partitioning function are not allowed
 ALTER TABLE t1
 PARTITION BY RANGE (TO_DAYS(a))
 (PARTITION p0 VALUES LESS THAN (10000),
@@ -84,8 +86,6 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 /*!50100 PARTITION BY HASH (TO_DAYS(a))
 PARTITIONS 3 */
-Warnings:
-Warning	1486	Constant, random or timezone-dependent expressions in (sub)partitioning function are not allowed
 CREATE TABLE t2 LIKE t1;
 SHOW CREATE TABLE t2;
 Table	Create Table