From 181459d4442963d5bf0b7ddbdcd48ec19574de59 Mon Sep 17 00:00:00 2001
From: "malff/marcsql@weblab.(none)" <>
Date: Thu, 2 Nov 2006 14:02:07 -0700
Subject: [PATCH] Post merge fix

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

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 36b69497e89..58bcc2b4d8d 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -502,7 +502,8 @@ deallocate prepare stmt;
 create table t1 (a varchar(20));
 insert into t1 values ('foo');
 prepare stmt FROM 'SELECT char_length (a) FROM t1';
-ERROR 42000: FUNCTION test.char_length does not exist
+prepare stmt2 FROM 'SELECT not_a_function (a) FROM t1';
+ERROR 42000: FUNCTION test.not_a_function does not exist
 drop table t1;
 prepare stmt from "SELECT SQL_CALC_FOUND_ROWS 'foo' UNION SELECT 'bar' LIMIT 0";
 execute stmt;
@@ -1056,7 +1057,8 @@ End of 4.1 tests.
 create table t1 (a varchar(20));
 insert into t1 values ('foo');
 prepare stmt FROM 'SELECT char_length (a) FROM t1';
-ERROR 42000: FUNCTION test.char_length does not exist
+prepare stmt2 FROM 'SELECT not_a_function (a) FROM t1';
+ERROR 42000: FUNCTION test.not_a_function does not exist
 drop table t1;
 create table t1 (a char(3) not null, b char(3) not null,
 c char(3) not null, primary key  (a, b, c));
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index c6839a8c93d..9048a3b2a56 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -523,8 +523,9 @@ deallocate prepare stmt;
 #
 create table t1 (a varchar(20)); 
 insert into t1 values ('foo'); 
---error 1305
 prepare stmt FROM 'SELECT char_length (a) FROM t1'; 
+-- error ER_SP_DOES_NOT_EXIST
+prepare stmt2 FROM 'SELECT not_a_function (a) FROM t1'; 
 drop table t1;
 
 #
@@ -1126,8 +1127,9 @@ DROP TABLE t1;
 #
 create table t1 (a varchar(20)); 
 insert into t1 values ('foo'); 
---error 1305
 prepare stmt FROM 'SELECT char_length (a) FROM t1'; 
+-- error ER_SP_DOES_NOT_EXIST
+prepare stmt2 FROM 'SELECT not_a_function (a) FROM t1'; 
 drop table t1;
 
 #