bk commit into 5.0 tree (acurtis:1.1857) BUG#8861

[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.1857 05/04/20 22:10:58 acurtis@stripped +3 -0
  Bug#8861 - If Return is a YEAR data type, value is not shown in year format
    Bug partially fixed by 9775/9102 work on SP function return.

  sql/protocol.cc
    1.99 05/04/20 22:10:46 acurtis@stripped +1 -0
    Bug#8861
      Requires change in assertion

  mysql-test/t/sp.test
    1.112 05/04/20 22:10:45 acurtis@stripped +13 -0
    Bug#8861
      Test for bug

  mysql-test/r/sp.result
    1.117 05/04/20 22:10:45 acurtis@stripped +10 -0
    Bug#8861
      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.98/sql/protocol.cc	2005-04-13 11:22:15 +01:00
+++ 1.99/sql/protocol.cc	2005-04-20 22:10:46 +01:00
@@ -774,6 +774,7 @@
 #ifndef DEBUG_OFF
   DBUG_ASSERT(field_types == 0 ||
 	      field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
+              field_types[field_pos] == MYSQL_TYPE_YEAR ||
               field_types[field_pos] == MYSQL_TYPE_BIT ||
               field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
 	      (field_types[field_pos] >= MYSQL_TYPE_ENUM &&

--- 1.116/mysql-test/r/sp.result	2005-04-20 18:08:26 +01:00
+++ 1.117/mysql-test/r/sp.result	2005-04-20 22:10:45 +01:00
@@ -2991,4 +2991,14 @@
 bug9775(1)	bug9775(2)	bug9775(3)	bug9775(4)
 a	b	a,b	
 drop function bug9775|
+drop function if exists bug8861|
+create function bug8861(v1 int) returns year return v1|
+select bug8861(05)|
+bug8861(05)
+2005
+set @x = bug8861(05)|
+select @x|
+@x
+2005
+drop function bug8861|
 drop table t1,t2;

--- 1.111/mysql-test/t/sp.test	2005-04-20 18:08:27 +01:00
+++ 1.112/mysql-test/t/sp.test	2005-04-20 22:10:45 +01:00
@@ -3672,6 +3672,19 @@
 
 
 #
+# BUG#8861: New bug synopsis
+#
+--disable_warnings
+drop function if exists bug8861|
+--enable_warnings
+create function bug8861(v1 int) returns year return v1|
+select bug8861(05)|
+set @x = bug8861(05)|
+select @x|
+drop function bug8861|
+
+
+#
 # BUG#NNNN: New bug synopsis
 #
 #--disable_warnings