bk commit into 5.0 tree (dlenev:1.1986) BUG#5860

[dlenev]

Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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.1986 05/06/29 10:35:49 dlenev@stripped +2 -0
  Added test for bug #5893 "Triggers with dropped functions cause crashes"
  
  (The bug itself was fixed earlier by the patch that fixed bug #5860
   "Multi-table UPDATE does not activate update triggers" and several
   other bugs). 

  mysql-test/t/trigger.test
    1.12 05/06/29 10:35:45 dlenev@stripped +14 -0
    Added test for bug #5893 "Triggers with dropped functions cause crashes"

  mysql-test/r/trigger.result
    1.8 05/06/29 10:35:45 dlenev@stripped +9 -0
    Added test for bug #5893 "Triggers with dropped functions cause crashes"

# 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:	dlenev
# Host:	brandersnatch.localdomain
# Root:	/home/dlenev/src/mysql-5.0-bg5893

--- 1.7/mysql-test/r/trigger.result	Mon May 30 18:55:52 2005
+++ 1.8/mysql-test/r/trigger.result	Wed Jun 29 10:35:45 2005
@@ -482,3 +482,12 @@
 1	1	0000-00-00 00:00:00
 2	2	0000-00-00 00:00:00
 drop table t1, t2;
+drop function if exists bug5893;
+create table t1 (col1 int, col2 int);
+insert into t1 values (1, 2);
+create function bug5893 () returns int return 5;
+create trigger t1_bu before update on t1 for each row set new.col1= bug5893();
+drop function bug5893;
+update t1 set col2 = 4;
+ERROR 42000: FUNCTION test.bug5893 does not exist
+drop table t1;

--- 1.11/mysql-test/t/trigger.test	Mon May 30 18:55:52 2005
+++ 1.12/mysql-test/t/trigger.test	Wed Jun 29 10:35:45 2005
@@ -494,3 +494,17 @@
 select * from t1;
 # Also drops all triggers
 drop table t1, t2;
+
+# Test for bug #5893 "Triggers with dropped functions cause crashes"
+# Appropriate error should be reported instead of crash.
+--disable_warnings
+drop function if exists bug5893;
+--enable_warnings
+create table t1 (col1 int, col2 int); 
+insert into t1 values (1, 2);
+create function bug5893 () returns int return 5;
+create trigger t1_bu before update on t1 for each row set new.col1= bug5893();
+drop function bug5893; 
+--error 1305
+update t1 set col2 = 4;
+drop table t1;