bk commit into 5.0 tree (acurtis:1.1855) BUG#7648

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of acurtis. When acurtis 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.1855 05/04/19 10:51:11 acurtis@stripped +3 -0
  Bug#7648 - Stored procedure crash when invoking a function that returns a bit
    bugfix 9102 corrected the crashing, this corrects the result.

  sql/item_func.h
    1.105 05/04/19 10:50:59 acurtis@stripped +11 -1
    Bug#7648
      Cannot cheat in Item_func_sp::val_int()

  mysql-test/t/sp.test
    1.110 05/04/19 10:50:59 acurtis@stripped +15 -2
    Bug#7648
      New test for bug

  mysql-test/r/sp.result
    1.115 05/04/19 10:50:58 acurtis@stripped +6 -0
    Bug#7648
      New test for bug

# 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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/.amd_mnt/bk.anubis/host/work-acurtis/bug9102

--- 1.104/sql/item_func.h	2005-04-01 00:13:23 +01:00
+++ 1.105/sql/item_func.h	2005-04-19 10:50:59 +01:00
@@ -1308,7 +1308,17 @@
 
   longlong val_int()
   {
-    return (longlong)Item_func_sp::val_real();
+    Item *it;
+    longlong l;
+
+    if (execute(&it))
+    {
+      null_value= 1;
+      return 0LL;
+    }
+    l= it->val_int();
+    null_value= it->null_value;
+    return l;
   }
 
   double val_real()

--- 1.114/mysql-test/r/sp.result	2005-04-19 09:09:10 +01:00
+++ 1.115/mysql-test/r/sp.result	2005-04-19 10:50:58 +01:00
@@ -2964,4 +2964,10 @@
 drop function bug9102|
 bug9102()
 a
+drop procedure if exists bug7648|
+create function bug7648() returns bit(8) return 'a'|
+select bug7648()|
+bug7648()
+a
+drop function bug7648|
 drop table t1,t2;

--- 1.109/mysql-test/t/sp.test	2005-04-19 09:09:10 +01:00
+++ 1.110/mysql-test/t/sp.test	2005-04-19 10:50:59 +01:00
@@ -3627,15 +3627,28 @@
 delete from t1|
 drop function bug9902|
 
+
 #
-# BUG#9102: New bug synopsis
+# BUG#9102: Stored proccedures: function which returns blob causes crash
 #
 --disable_warnings
 drop function if exists bug9102|
 --enable_warnings
 create function bug9102() returns blob return 'a'|
-select bug9102();
+select bug9102()|
 drop function bug9102|
+
+
+#
+# BUG#7648: Stored procedure crash when invoking a function that returns a bit
+#
+--disable_warnings
+drop procedure if exists bug7648|
+--enable_warnings
+create function bug7648() returns bit(8) return 'a'|
+select bug7648()|
+drop function bug7648|
+
 
 #
 # BUG#NNNN: New bug synopsis