From 33e3a59d236ccca6fa1ae2bd99a173a41cf74eda Mon Sep 17 00:00:00 2001
From: unknown <mikael@dator5.(none)>
Date: Wed, 21 Jun 2006 19:08:30 -0400
Subject: [PATCH] mmanual merge

---
 mysql-test/r/partition.result | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 63abaf6eda4..7bea0de80b8 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -6,6 +6,13 @@ create procedure pz()
 alter table t1 engine = myisam;
 call pz();
 call pz();
+drop procedure pz;
+drop table t1;
+create table t1 (a int)
+engine = csv
+partition by list (a)
+(partition p0 values in (null));
+ERROR HY000: CSV handler cannot be used in partitioned tables
 create table t1 (a bigint)
 partition by range (a)
 (partition p0 values less than (0xFFFFFFFFFFFFFFFF),