diff options
author | acurtis@pcgem.rdg.cyberkinetica.com <> | 2005-03-04 21:14:35 +0000 |
---|---|---|
committer | acurtis@pcgem.rdg.cyberkinetica.com <> | 2005-03-04 21:14:35 +0000 |
commit | 5e1d2ad68cdb55c88615a7937e15b0723ddc9743 (patch) | |
tree | 2221a43d29eb490f6aab0ccd507746719c3e782a /sql/item_func.h | |
parent | 05eb8af434950a66dd0e3b5416d85b3c008e5c57 (diff) | |
download | mariadb-git-5e1d2ad68cdb55c88615a7937e15b0723ddc9743.tar.gz |
Bug#3788
Crashes with stored procedure return non-string values
Also fixes Bug#2773
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 48fc278ccde..cb096732b85 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1250,8 +1250,13 @@ class Item_func_sp :public Item_func private: sp_name *m_name; mutable sp_head *m_sp; + mutable struct { + TABLE table; + TABLE_SHARE share; + } dummy_table; int execute(Item **itp); + Field *sp_result_field(void) const; public: @@ -1266,6 +1271,10 @@ public: enum enum_field_types field_type() const; + Field *tmp_table_field(TABLE *t_arg); + + void make_field(Send_field *tmp_field); + Item_result result_type() const; longlong val_int() |