summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorunknown <acurtis@pcgem.rdg.cyberkinetica.com>2005-03-04 21:14:35 +0000
committerunknown <acurtis@pcgem.rdg.cyberkinetica.com>2005-03-04 21:14:35 +0000
commit1220069c537a733b233c446e27aec9f9247aef31 (patch)
tree2221a43d29eb490f6aab0ccd507746719c3e782a /sql/unireg.cc
parent5abbffd702026f86c7ba8c8b0a515f9ae2ae23bf (diff)
downloadmariadb-git-1220069c537a733b233c446e27aec9f9247aef31.tar.gz
Bug#3788
Crashes with stored procedure return non-string values Also fixes Bug#2773 mysql-test/r/information_schema.result: Bug#3788 Fix results for bugfix mysql-test/r/sp.result: Bug#3788 Tests for Bug Fix results for bugfix mysql-test/t/sp.test: Bug#3788 New tests for bug sql/item.cc: Fix unrelated crash in view test with --ps-protocol. sql/item_func.cc: Bug#3788 Alter how SP function result types are handled. sql/item_func.h: Bug#3788 Alter how SP function result types are handled. sql/mysql_priv.h: Bug#3788 Prototypes for new global functions sql/sp.cc: Bug#3788 Alter how function return type is reported sql/sp_head.cc: Bug#3788 Change how function return types are stored for SPs sql/sp_head.h: Bug#3788 Change how function return types are stored for SPs sql/sql_parse.cc: Bug#3788 Split out field construction into its own function sql/sql_table.cc: Bug#3788 Split out field preparation code into its own function sql/sql_yacc.yy: Bug#3788 Change how function return types are stored for SPs sql/unireg.cc: Bug#3788 Add assertion check
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index dd94098fbf3..3e85767dc86 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -695,6 +695,7 @@ static bool make_empty_rec(File file,enum db_type table_type,
field->interval,
field->field_name,
&table);
+ DBUG_ASSERT(regfield);
if (!(field->flags & NOT_NULL_FLAG))
null_count++;