bk commit into 5.0 tree (petr:1.1943) BUG#13124

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps 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.1943 05/09/13 15:15:38 petr@stripped +3 -0
  Fix for Bug #13124 Stored Procedure using SELECT INTO crashes server

  sql/item.cc
    1.177 05/09/13 15:15:27 petr@stripped +6 -1
    check for NULL value before copying string

  mysql-test/t/sp.test
    1.146 05/09/13 15:15:27 petr@stripped +15 -0
    corrected result file

  mysql-test/r/sp.result
    1.151 05/09/13 15:15:27 petr@stripped +8 -0
    added a test

# 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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.0-virgin

--- 1.176/sql/item.cc	2005-09-09 16:50:02 +04:00
+++ 1.177/sql/item.cc	2005-09-13 15:15:27 +04:00
@@ -818,6 +818,8 @@
   DBUG_ASSERT(fixed);
   Item *it= this_item();
   String *ret= it->val_str(sp);
+
+  null_value= it->null_value;
   /*
     This way we mark returned value of val_str as const,
     so that various functions (e.g. CONCAT) won't try to
@@ -833,9 +835,12 @@
     This is intended behaviour of Item_func_concat. Comments to
     Item_param class contain some more details on the topic.
   */
+
+  if (!ret)
+    return NULL;
+
   str_value_ptr.set(ret->ptr(), ret->length(),
                     ret->charset());
-  null_value= it->null_value;
   return &str_value_ptr;
 }
 

--- 1.150/mysql-test/r/sp.result	2005-09-09 10:08:44 +04:00
+++ 1.151/mysql-test/r/sp.result	2005-09-13 15:15:27 +04:00
@@ -3225,4 +3225,12 @@
 @var
 abcdabcd
 drop procedure bug12849_2|
+drop procedure if exists bug13124|
+create procedure bug13124()
+begin
+declare y integer;
+set @x=y;
+end|
+call bug13124()|
+drop procedure  bug13124|
 drop table t1,t2;

--- 1.145/mysql-test/t/sp.test	2005-09-09 10:08:44 +04:00
+++ 1.146/mysql-test/t/sp.test	2005-09-13 15:15:27 +04:00
@@ -4064,6 +4064,21 @@
 drop procedure bug12849_2|
 
 #
+# Bug #13124    Stored Procedure using SELECT INTO crashes server
+#
+
+--disable_warnings
+drop procedure if exists bug13124|
+--enable_warnings
+create procedure bug13124()
+begin
+  declare y integer;
+  set @x=y;
+end|
+call bug13124()|
+drop procedure  bug13124|
+
+#
 # BUG#NNNN: New bug synopsis
 #
 #--disable_warnings