bk commit into 5.0 tree (bar:1.1939)

[bar]

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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.1939 05/09/02 10:35:51 bar@stripped +1 -0
  sp_head.cc:
    Fix crash reported in bug 12849.
    It doesn't fix the whole problem though.
    Let Pem fix it later.

  sql/sp_head.cc
    1.177 05/09/02 10:30:50 bar@stripped +2 -2
    Fix crash reported in bug 12849.
    It doesn't fix the whole problem though.
    Let Pem fix it later.

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.0

--- 1.176/sql/sp_head.cc	2005-08-28 21:25:49 +05:00
+++ 1.177/sql/sp_head.cc	2005-09-02 10:30:50 +05:00
@@ -244,8 +244,8 @@
     }
     DBUG_PRINT("info",("STRING_RESULT: %*s",
                        s->length(), s->c_ptr_quick()));
-    CREATE_ON_CALLERS_ARENA(it= new(reuse, &rsize)
-                            Item_string(it->collation.collation),
+    CHARSET_INFO *itcs= it->collation.collation;
+    CREATE_ON_CALLERS_ARENA(it= new(reuse, &rsize) Item_string(itcs),
                             use_callers_arena, &backup_current_arena);
     /*
       We have to use special constructor and allocate string