bk commit into 4.1 tree (evgen:1.2461)

[eugene]

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen 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.2461 05/11/01 17:34:19 evgen@stripped +2 -0
  Merge epotemkin@stripped:/home/bk/mysql-4.1
  into moonbone.local:/work/14186-bug-4.1-mysql

  sql/sql_select.h
    1.78 05/11/01 17:34:18 evgen@stripped +0 -0
    Auto merged

  sql/sql_select.cc
    1.443 05/11/01 17:34:18 evgen@stripped +0 -0
    Auto merged

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/14186-bug-4.1-mysql/RESYNC

--- 1.442/sql/sql_select.cc	2005-10-28 15:24:03 +04:00
+++ 1.443/sql/sql_select.cc	2005-11-01 17:34:18 +03:00
@@ -69,8 +69,6 @@
 			    SELECT_LEX_UNIT *unit);
 static COND *optimize_cond(THD *thd, COND *conds,
 			   Item::cond_result *cond_value);
-static COND *remove_eq_conds(THD *thd, COND *cond, 
-			     Item::cond_result *cond_value);
 static bool const_expression_in_where(COND *conds,Item *item, Item **comp_item);
 static bool open_tmp_table(TABLE *table);
 static bool create_myisam_tmp_table(TABLE *table,TMP_TABLE_PARAM *param,
@@ -4615,7 +4613,7 @@
   COND_FALSE always false	( 1 = 2 )
 */
 
-static COND *
+COND *
 remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value)
 {
   if (cond->type() == Item::COND_ITEM)

--- 1.77/sql/sql_select.h	2005-10-28 01:15:33 +04:00
+++ 1.78/sql/sql_select.h	2005-11-01 17:34:18 +03:00
@@ -204,6 +204,7 @@
   //Part, shared with list above, emulate following list
   List<Item> tmp_fields_list1, tmp_fields_list2, tmp_fields_list3;
   List<Item> &fields_list; // hold field list passed to mysql_select
+  List<Item> procedure_fields_list;
   int error;
 
   ORDER *order, *group_list, *proc_param; //hold parameters of mysql_select