Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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/in...urce-tree.html

ChangeSet
1.2167 05/03/31 10:47:32 msvensson (AT) neptunus (DOT) (none) +3 -0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1

sql/item_subselect.h
1.60 05/03/31 10:47:31 msvensson (AT) neptunus (DOT) (none) +0 -0
Auto merged

sql/item.h
1.176 05/03/31 10:47:30 msvensson (AT) neptunus (DOT) (none) +0 -0
Auto merged

sql/item.cc
1.197 05/03/31 10:47:30 msvensson (AT) neptunus (DOT) (none) +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: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/mysql-4.1/RESYNC

--- 1.196/sql/item.cc 2005-03-30 22:07:59 +02:00
+++ 1.197/sql/item.cc 2005-03-31 10:47:30 +02:00
@@ -1319,6 +1319,34 @@
return rc;
}

+bool Item_param::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
+{
+ DBUG_ASSERT(fixed == 0);
+ SELECT_LEX *cursel= (SELECT_LEX *) thd->lex->current_select;
+
+ /*
+ Parameters in a subselect should mark the subselect as not constant
+ during prepare
+ */
+ if (state == NO_VALUE)
+ {
+ /*
+ SELECT_LEX_UNIT::item set only for subqueries, so test of it presence
+ can be barrier to stop before derived table SELECT or very outer SELECT
+ */
+ for(;
+ cursel->master_unit()->item;
+ cursel= cursel->outer_select())
+ {
+ Item_subselect *subselect_item= cursel->master_unit()->item;
+ subselect_item->used_tables_cache|= OUTER_REF_TABLE_BIT;
+ subselect_item->const_item_cache= 0;
+ }
+ }
+ fixed= 1;
+ return 0;
+}
+
/* End of Item_param related */



--- 1.175/sql/item.h 2005-03-30 09:13:21 +02:00
+++ 1.176/sql/item.h 2005-03-31 10:47:30 +02:00
@@ -559,6 +559,7 @@
bool get_time(TIME *tm);
bool get_date(TIME *tm, uint fuzzydate);
int save_in_field(Field *field, bool no_conversions);
+ bool fix_fields(THD *, struct st_table_list *, Item **);

void set_null();
void set_int(longlong i, uint32 max_length_arg);

--- 1.59/sql/item_subselect.h 2005-03-10 13:00:30 +01:00
+++ 1.60/sql/item_subselect.h 2005-03-31 10:47:31 +02:00
@@ -119,6 +119,7 @@
friend class Item_in_optimizer;
friend bool Item_field::fix_fields(THD *, TABLE_LIST *, Item **);
friend bool Item_ref::fix_fields(THD *, TABLE_LIST *, Item **);
+ friend bool Item_param::fix_fields(THD *, TABLE_LIST *, Item **);
};

/* single value subselect */

--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw