summaryrefslogtreecommitdiff
path: root/sql/protocol.cc
diff options
context:
space:
mode:
authorunknown <acurtis@xiphis.org>2005-04-21 13:22:47 +0100
committerunknown <acurtis@xiphis.org>2005-04-21 13:22:47 +0100
commit62556b0023ede28e429eed345344323643f898c7 (patch)
tree8df8337ce1a9874bfb77d66f673ac6c9b35efc30 /sql/protocol.cc
parentde8a3b31218f66948ecfc4ce4fee85a0285ae161 (diff)
downloadmariadb-git-62556b0023ede28e429eed345344323643f898c7.tar.gz
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. mysql-test/r/sp.result: Bug#8861 Test for bug mysql-test/t/sp.test: Bug#8861 Test for bug sql/protocol.cc: Bug#8861 Requires change in assertion
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r--sql/protocol.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc
index dc9ab7bf795..edeb78cc00b 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -774,6 +774,7 @@ bool Protocol_simple::store(const char *from, uint length,
#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 &&