From a37eea1993e41700f382f2f03d938208b8ed79b1 Mon Sep 17 00:00:00 2001
From: "dlenev@mysql.com" <>
Date: Wed, 13 Jul 2005 16:22:36 +0400
Subject: [PATCH] Fixed trigger.test after fixing bug #11554 "Server crashes on
 statement indirectly using non-cached function".

---
 mysql-test/r/trigger.result | 12 +++++++++---
 mysql-test/t/trigger.test   | 25 +++++++++++--------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index 746c900d743..60aa358a9f1 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -232,9 +232,6 @@ if new.id > f1() then
 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 @@ i	k	ts
 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;
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index 229cbd3c79c..39638cc437e 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
@@ -244,8 +244,6 @@ begin
   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 @@ drop table t1, t2;
 
 # 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;