bk commit into 5.1 tree (malff:1.2340)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-02 14:02:07-07:00, malff@weblab.(none) +2 -0
  Post merge fix

  mysql-test/r/ps.result@stripped, 2006-11-02 14:02:05-07:00, malff@weblab.(none) +4 -2
    Post merge fix

  mysql-test/t/ps.test@stripped, 2006-11-02 14:02:05-07:00, malff@weblab.(none) +4 -2
    Post merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-21114_b

--- 1.85/mysql-test/r/ps.result	2006-11-02 14:02:13 -07:00
+++ 1.86/mysql-test/r/ps.result	2006-11-02 14:02:13 -07:00
@@ -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));

--- 1.80/mysql-test/t/ps.test	2006-11-02 14:02:13 -07:00
+++ 1.81/mysql-test/t/ps.test	2006-11-02 14:02:13 -07:00
@@ -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;
 
 #