MDEV-12007 Allow ROW variables as a cursor FETCH target

1 files changed, 32 insertions, 4 deletions

diff --git a/sql/sp_rcontext.cc b/sql/sp_rcontext.cc
index 17c91b09727..3ae455e00c9 100644
--- a/sql/sp_rcontext.cc
+++ b/sql/sp_rcontext.cc
@@ -572,6 +572,22 @@ int sp_rcontext::set_variable_row_field(THD *thd, uint var_idx, uint field_idx,
 }
 
 
+int sp_rcontext::set_variable_row(THD *thd, uint var_idx, List<Item> &items)
+{
+  DBUG_ENTER("sp_rcontext::set_variable_row");
+  DBUG_ASSERT(thd->spcont->get_item(var_idx)->cols() == items.elements);
+  List_iterator<Item> it(items);
+  Item *item;
+  for (uint i= 0 ; (item= it++) ; i++)
+  {
+    int rc;
+    if ((rc= thd->spcont->set_variable_row_field(thd, var_idx, i, &item)))
+      DBUG_RETURN(rc);
+  }
+  DBUG_RETURN(0);
+}
+
+
 Item_cache *sp_rcontext::create_case_expr_holder(THD *thd,
                                                  const Item *item) const
 {
@@ -688,7 +704,9 @@ int sp_cursor::fetch(THD *thd, List<sp_variable> *vars)
                MYF(0));
     return -1;
   }
-  if (vars->elements != result.get_field_count())
+  if (vars->elements != result.get_field_count() &&
+      (vars->elements != 1 ||
+       !vars->head()->field_def.is_row(result.get_field_count())))
   {
     my_message(ER_SP_WRONG_NO_OF_FETCH_ARGS,
                ER_THD(thd, ER_SP_WRONG_NO_OF_FETCH_ARGS), MYF(0));
@@ -743,15 +761,16 @@ int sp_cursor::Select_fetch_into_spvars::prepare(List<Item> &fields,
 }
 
 
-int sp_cursor::Select_fetch_into_spvars::send_data(List<Item> &items)
+bool sp_cursor::Select_fetch_into_spvars::
+       send_data_to_variable_list(List<sp_variable> &vars, List<Item> &items)
 {
-  List_iterator_fast<sp_variable> spvar_iter(*spvar_list);
+  List_iterator_fast<sp_variable> spvar_iter(vars);
   List_iterator_fast<Item> item_iter(items);
   sp_variable *spvar;
   Item *item;
 
   /* Must be ensured by the caller */
-  DBUG_ASSERT(spvar_list->elements == items.elements);
+  DBUG_ASSERT(vars.elements == items.elements);
 
   /*
     Assign the row fetched from a server side cursor to stored
@@ -764,3 +783,12 @@ int sp_cursor::Select_fetch_into_spvars::send_data(List<Item> &items)
   }
   return false;
 }
+
+
+int sp_cursor::Select_fetch_into_spvars::send_data(List<Item> &items)
+{
+  return (spvar_list->elements == 1 &&
+          (spvar_list->head())->field_def.is_row(items.elements)) ?
+    thd->spcont->set_variable_row(thd, spvar_list->head()->offset, items) :
+    send_data_to_variable_list(*spvar_list, items);
+}