bk commit into 5.0 tree (konstantin:1.1960)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1960 05/09/08 17:53:14 konstantin@stripped +2 -0
  Remove an obsolete comment and an unused variable.

  sql/sql_select.h
    1.98 05/09/08 17:53:09 konstantin@stripped +1 -3
    Remove an unused variable.

  sql/sp_head.cc
    1.180 05/09/08 17:53:09 konstantin@stripped +0 -11
    Remove an obsolete comment (recursion in SP is disabled)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/media/sda1/mysql/mysql-5.0-9819

--- 1.97/sql/sql_select.h	2005-08-12 14:54:36 +04:00
+++ 1.98/sql/sql_select.h	2005-09-08 17:53:09 +04:00
@@ -230,7 +230,7 @@
   /* Is set if we have a GROUP BY and we have ORDER BY on a constant. */
   bool          skip_sort_order;
 
-  bool need_tmp, hidden_group_fields, buffer_result;
+  bool need_tmp, hidden_group_fields;
   DYNAMIC_ARRAY keyuse;
   Item::cond_result cond_value;
   List<Item> all_fields; // to store all fields that used in query
@@ -299,8 +299,6 @@
     skip_sort_order= 0;
     need_tmp= 0;
     hidden_group_fields= 0; /*safety*/
-    buffer_result= test(select_options & OPTION_BUFFER_RESULT) &&
-      !test(select_options & OPTION_FOUND_ROWS);
     error= 0;
     select= 0;
     return_tab= 0;

--- 1.179/sql/sp_head.cc	2005-09-03 03:13:09 +04:00
+++ 1.180/sql/sp_head.cc	2005-09-08 17:53:09 +04:00
@@ -1827,17 +1827,6 @@
   thd->query_id= next_query_id();
   VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
-  /*
-    FIXME. Resetting statement (and using it) is not reentrant, thus recursive
-           functions which try to use the same LEX twice will crash server.
-           We should prevent such situations by tracking if LEX is already
-           in use and throwing error about unallowed recursion if needed.
-           OTOH it is nice to allow recursion in cases when LEX is not really
-           used (e.g. in mathematical functions), so such tracking should be
-           implemented at the same time as ability not to store LEX for
-           instruction if it is not really used.
-  */
-
   if (thd->prelocked_mode == NON_PRELOCKED)
   {
     /*