bk commit into 5.0 tree (dlenev:1.1918) BUG#11554

[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.1918 05/07/13 16:22:36 dlenev@stripped +2 -0
  Fixed trigger.test after fixing bug #11554 "Server crashes on statement
  indirectly using non-cached function".

  mysql-test/t/trigger.test
    1.15 05/07/13 16:22:14 dlenev@stripped +11 -14
    Fixed test case after fixing bug #11554 "Server crashes on statement
    indirectly using non-cached function".

  mysql-test/r/trigger.result
    1.11 05/07/13 16:22:14 dlenev@stripped +9 -3
    Fixed test case after fixing bug #11554 "Server crashes on statement
    indirectly using non-cached function".

# 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-mysqlproc

--- 1.10/mysql-test/r/trigger.result	2005-07-09 23:11:02 +04:00
+++ 1.11/mysql-test/r/trigger.result	2005-07-13 16:22:14 +04:00
@@ -232,9 +232,6 @@
 set new.id:= f1();
 end if;
 end|
-select f1();
-f1()
-10
 insert into t1 values (1, "first");
 insert into t1 values (f1(), "max");
 select * from t1;
@@ -573,3 +570,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.14/mysql-test/t/trigger.test	2005-07-09 23:11:02 +04:00
+++ 1.15/mysql-test/t/trigger.test	2005-07-13 16:22:14 +04:00
@@ -244,8 +244,6 @@
   end if;
 end|
 delimiter ;|
-# Remove this once bug #11554 will be fixed.
-select f1();
 insert into t1 values (1, "first");
 insert into t1 values (f1(), "max");
 select * from t1;
@@ -578,15 +576,14 @@
 
 # Test for bug #5893 "Triggers with dropped functions cause crashes"
 # Appropriate error should be reported instead of crash.
-# Had to disable this test until bug #11554 will be fixed.
-#--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;
+--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;