From ff0b30219f8b47b70f14211c1180148de3dee4d1 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Sat, 11 Jun 2011 14:53:08 +0300
Subject: [PATCH] Updated to new error messages for partitions when .par file
 is missing

---
 mysql-test/r/partition_error.result | 5 +++--
 mysql-test/t/partition_error.test   | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/partition_error.result b/mysql-test/r/partition_error.result
index 269b6875430..a14b1280eb7 100644
--- a/mysql-test/r/partition_error.result
+++ b/mysql-test/r/partition_error.result
@@ -657,15 +657,16 @@ CREATE TABLE t1 (a INT) PARTITION BY HASH (a);
 FLUSH TABLES;
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
+test.t1	check	Error	File './test/t1.par' not found (Errcode: 2)
 test.t1	check	Error	Failed to read from the .par file
 test.t1	check	Error	Incorrect information in file: './test/t1.frm'
 test.t1	check	error	Corrupt
 SELECT * FROM t1;
-ERROR HY000: Failed to read from the .par file
+ERROR HY000: File './test/t1.par' not found (Errcode: 2)
 # Note that it is currently impossible to drop a partitioned table
 # without the .par file
 DROP TABLE t1;
-ERROR 42S02: Unknown table 't1'
+ERROR HY000: File './test/t1.par' not found (Errcode: 2)
 #
 # Bug#49477: Assertion `0' failed in ha_partition.cc:5530
 # with temporary table and partitions
diff --git a/mysql-test/t/partition_error.test b/mysql-test/t/partition_error.test
index 7e574fd6a42..81bb7b55cec 100644
--- a/mysql-test/t/partition_error.test
+++ b/mysql-test/t/partition_error.test
@@ -695,12 +695,15 @@ CREATE TABLE t1 (a INT) PARTITION BY HASH (a);
 FLUSH TABLES;
 --remove_file $MYSQLD_DATADIR/test/t1.par
 --replace_result $MYSQLD_DATADIR ./
+--replace_result \\ /
 CHECK TABLE t1;
---error ER_UNKNOWN_ERROR
+--replace_result \\ /
+--error 29
 SELECT * FROM t1;
 --echo # Note that it is currently impossible to drop a partitioned table
 --echo # without the .par file
---error ER_BAD_TABLE_ERROR
+--replace_result \\ /
+--error 29
 DROP TABLE t1;
 --remove_file $MYSQLD_DATADIR/test/t1.frm
 --remove_file $MYSQLD_DATADIR/test/t1#P#p0.MYI