bk commit into 5.0 tree (pem:1.2034)

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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
  1.2034 06/02/06 16:07:13 pem@stripped +2 -0
  Merge mysql.com:/extern/mysql/bk/mysql-5.0
  into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0

  sql/sql_parse.cc
    1.525 06/02/06 16:07:07 pem@stripped +0 -0
    Auto merged

  mysql-test/t/sp-destruct.test
    1.5 06/02/06 16:07:07 pem@stripped +0 -0
    Auto merged

# 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:	pem
# Host:	pem.mysql.com
# Root:	/extern/mysql/work/bug16303/mysql-5.0/RESYNC

--- 1.4/mysql-test/t/sp-destruct.test	2006-01-24 08:30:49 +01:00
+++ 1.5/mysql-test/t/sp-destruct.test	2006-02-06 16:07:07 +01:00
@@ -119,6 +119,15 @@
 insert into t1 values (0);
 
 # Clean-up
-delete from mysql.proc where name like 'bug14233%';
 drop trigger t1_ai;
 drop table t1;
+
+#
+# BUG#16303: erroneus stored procedures and functions should be droppable
+#
+drop function bug14233_1;
+drop function bug14233_2;
+drop procedure bug14233_3;
+# Assert: These should show nothing.
+show procedure status;
+show function status;