summaryrefslogtreecommitdiff
path: root/sql/protocol.h
diff options
context:
space:
mode:
authorpem@mysql.comhem.se <>2005-06-01 12:18:41 +0200
committerpem@mysql.comhem.se <>2005-06-01 12:18:41 +0200
commit85f19d5da53b842d4e68a7b2a5eac64aa7b655d2 (patch)
tree07365c13a3a8a2fdc4f0b9ef7733476f8d8909df /sql/protocol.h
parent1061c412ba9115abd3df27641b92b87ec5ad63c5 (diff)
downloadmariadb-git-85f19d5da53b842d4e68a7b2a5eac64aa7b655d2.tar.gz
Fixed BUG#10961: Stored procedures: crash if select * from dual
Have to catch errors from SELECT when opening a cursor.
Diffstat (limited to 'sql/protocol.h')
-rw-r--r--sql/protocol.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/protocol.h b/sql/protocol.h
index 01331ef64ba..5b402cb2669 100644
--- a/sql/protocol.h
+++ b/sql/protocol.h
@@ -159,8 +159,8 @@ public:
MYSQL_ROWS **prev_record;
ulong row_count;
- Protocol_cursor() {}
- Protocol_cursor(THD *thd_arg, MEM_ROOT *ini_alloc) :Protocol_simple(thd_arg), alloc(ini_alloc) {}
+ Protocol_cursor() :data(NULL) {}
+ Protocol_cursor(THD *thd_arg, MEM_ROOT *ini_alloc) :Protocol_simple(thd_arg), alloc(ini_alloc), data(NULL) {}
bool prepare_for_send(List<Item> *item_list)
{
row_count= 0;