bk commit into 5.1 tree (dlenev:1.2358) BUG#23651

[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 14:30:12+03:00, dlenev@stripped +1 -0
  Small adjustment after merging fix for bug#23651 "Server crashes when
  trigger which uses stored function invoked from different connections"
  into 5.1.

  sql/item_func.cc@stripped, 2006-11-13 14:30:10+03:00, dlenev@stripped +1 -1
    After merge fix. Starting from 5.1 TABLE_SHARE for dummy TABLE object
    is also allocated in Item_func_sp constructor, so we use TABLE::alias
    instead of TABLE::s to check that dummy TABLE was not initialized yet
    or requires re-initialization.

# 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

--- 1.330/sql/item_func.cc	2006-11-13 14:30:17 +03:00
+++ 1.331/sql/item_func.cc	2006-11-13 14:30:17 +03:00
@@ -4852,7 +4852,7 @@
     result_field= NULL;
   }
   m_sp= NULL;
-  dummy_table->s= NULL;
+  dummy_table->alias= NULL;
   Item_func::cleanup();
 }