bk commit into 5.1 tree (dlenev:1.2357)

[dlenev]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2006-11-13 11:29:40+03:00, dlenev@stripped +3 -0
  Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651
  into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
  MERGE: 1.1810.1698.179

  mysql-test/r/trigger.result@stripped, 2006-11-13 11:29:37+03:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.29.1.20

  mysql-test/t/trigger.test@stripped, 2006-11-13 11:29:37+03:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.34.1.21

  sql/item_func.cc@stripped, 2006-11-13 11:29:37+03:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.270.1.43

# 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:	mockturtle.local
# Root:	/home/dlenev/src/mysql-5.1-merge/RESYNC

--- 1.329/sql/item_func.cc	2006-11-13 11:29:47 +03:00
+++ 1.330/sql/item_func.cc	2006-11-13 11:29:47 +03:00
@@ -4852,6 +4852,7 @@
     result_field= NULL;
   }
   m_sp= NULL;
+  dummy_table->s= NULL;
   Item_func::cleanup();
 }
 

--- 1.52/mysql-test/r/trigger.result	2006-11-13 11:29:47 +03:00
+++ 1.53/mysql-test/r/trigger.result	2006-11-13 11:29:47 +03:00
@@ -1241,4 +1241,19 @@
 2	2
 13	13
 drop table t1;
+drop table if exists t1;
+drop function if exists f1;
+create table t1 (i int);
+create function f1() returns int return 10;
+create trigger t1_bi before insert on t1 for each row set @a:= f1() + 10;
+insert into t1 values ();
+select @a;
+@a
+20
+insert into t1 values ();
+select @a;
+@a
+20
+drop table t1;
+drop function f1;
 End of 5.0 tests

--- 1.56/mysql-test/t/trigger.test	2006-11-13 11:29:47 +03:00
+++ 1.57/mysql-test/t/trigger.test	2006-11-13 11:29:47 +03:00
@@ -1499,4 +1499,24 @@
 drop table t1;
 
 
+#
+# Bug #23651 "Server crashes when trigger which uses stored function
+#             invoked from different connections".
+#
+--disable_warnings
+drop table if exists t1;
+drop function if exists f1;
+--enable_warnings
+create table t1 (i int);
+create function f1() returns int return 10;
+create trigger t1_bi before insert on t1 for each row set @a:= f1() + 10;
+insert into t1 values ();
+select @a;
+connection addconroot1;
+insert into t1 values ();
+select @a;
+connection default;
+drop table t1;
+drop function f1;
+
 --echo End of 5.0 tests