bk commit into 5.0 tree (jimw:1.1919)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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.1919 05/08/01 15:43:40 jimw@stripped +1 -0
  Fix crash in 'SHOW CREATE FUNCTION' introduced by Monty's last
  cleanup.

  sql/sp_head.cc
    1.161 05/08/01 15:43:36 jimw@stripped +1 -3
    Remove unused variable and always add sql_mode to fields in
    sp_head::show_create_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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean

--- 1.160/sql/sp_head.cc	2005-07-28 12:39:07 -07:00
+++ 1.161/sql/sp_head.cc	2005-08-01 15:43:36 -07:00
@@ -1320,7 +1320,6 @@
   String buffer(buff, sizeof(buff), system_charset_info);
   int res;
   List<Item> field_list;
-  sys_var *sql_mode_var;
   byte *sql_mode_str;
   ulong sql_mode_len;
   bool full_access;
@@ -1337,8 +1336,7 @@
                                                        m_sql_mode,
                                                        &sql_mode_len);
   field_list.push_back(new Item_empty_string("Function",NAME_LEN));
-  if (sql_mode_var)
-    field_list.push_back(new Item_empty_string("sql_mode", sql_mode_len));
+  field_list.push_back(new Item_empty_string("sql_mode", sql_mode_len));
   field_list.push_back(new Item_empty_string("Create Function",
 					     max(buffer.length(),1024)));
   if (protocol->send_fields(&field_list,