Fixed BUG#2776: Stored procedure crash if variable assigned to default.

Keep track on the default value and use it. (Or NULL, if not declared.)

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h
index 02134e3604f..a82cefa2e42 100644
--- a/sql/sp_pcontext.h
+++ b/sql/sp_pcontext.h
@@ -36,6 +36,7 @@ typedef struct sp_pvar
   sp_param_mode_t mode;
   uint offset;			// Offset in current frame
   my_bool isset;
+  Item *dflt;
 } sp_pvar_t;
 
 typedef struct sp_label
@@ -130,6 +131,15 @@ class sp_pcontext : public Sql_alloc
       p->isset= val;
   }
 
+  inline void
+  set_default(uint i, Item *it)
+  {
+    sp_pvar_t *p= find_pvar(i);
+
+    if (p)
+      p->dflt= it;
+  }
+
   void
   push_pvar(LEX_STRING *name, enum enum_field_types type, sp_param_mode_t mode);