Port of cursors to be pushed into 5.0 tree:

- client side part is simple and may be considered stable
- server side part now just joggles with THD state to save execution
  state and has no additional locking wisdom.
  Lot's of it are to be rewritten.

1 files changed, 7 insertions, 1 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 35f8a390308..d6b776571f2 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -31,7 +31,13 @@ int mysql_union(THD *thd, LEX *lex, select_result *result,
   int res, res_cln;
   if (!(res= unit->prepare(thd, result, SELECT_NO_UNLOCK)))
     res= unit->exec();
-  res_cln= unit->cleanup();
+  if (res == 0 && thd->cursor && thd->cursor->is_open())
+  {
+    thd->cursor->set_unit(unit);
+    res_cln= 0;
+  }
+  else
+    res_cln= unit->cleanup();
   DBUG_RETURN(res?res:res_cln);
 }