summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
diff options
context:
space:
mode:
authormalff/marcsql@weblab.(none) <>2007-03-01 14:06:57 -0700
committermalff/marcsql@weblab.(none) <>2007-03-01 14:06:57 -0700
commitdf5c5aea23b4e66dc93ec2501fa2c841497e3c46 (patch)
tree5a34f3dfd4f42f36968f10971e3d69ddc1b94e94 /sql/sp_head.cc
parent2f5a2b2476a0ca43d0a5bdfb979b427ff806839f (diff)
parent7d98fb7e33de4f1bf62854ee115a5301c2506860 (diff)
downloadmariadb-git-df5c5aea23b4e66dc93ec2501fa2c841497e3c46.tar.gz
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r--sql/sp_head.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 24bdd2db5b6..71460a67934 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -36,6 +36,7 @@ Item_result
sp_map_result_type(enum enum_field_types type)
{
switch (type) {
+ case MYSQL_TYPE_BIT:
case MYSQL_TYPE_TINY:
case MYSQL_TYPE_SHORT:
case MYSQL_TYPE_LONG:
@@ -58,6 +59,7 @@ Item::Type
sp_map_item_type(enum enum_field_types type)
{
switch (type) {
+ case MYSQL_TYPE_BIT:
case MYSQL_TYPE_TINY:
case MYSQL_TYPE_SHORT:
case MYSQL_TYPE_LONG: