diff options
| author | unknown <konstantin@mysql.com> | 2005-07-13 18:05:57 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-13 18:05:57 +0400 |
| commit | 91c97a76fcc6cc24dfbea96e904b2ecf4c968a1a (patch) | |
| tree | f231b6cdd94512d3ff0c59fd85ca05f4b6a46f13 /sql/item_subselect.h | |
| parent | 7001961e255dd454fe79311d5721dc9223f662e0 (diff) | |
| parent | 7a0f6d522bda0725f589c18e9214878d90bee2d0 (diff) | |
| download | mariadb-git-91c97a76fcc6cc24dfbea96e904b2ecf4c968a1a.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-11458
into mysql.com:/opt/local/work/mysql-5.0-root
sql/mysql_priv.h:
Auto merged
sql/sql_lex.h:
Auto merged
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql/item.cc:
Manual merge.
sql/item.h:
Manual merge.
sql/item_subselect.h:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_prepare.cc:
Manual merge.
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index e05db4a00cc..0b5736169fa 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -121,7 +121,6 @@ public: friend class Item_in_optimizer; friend bool Item_field::fix_fields(THD *, Item **); friend bool Item_ref::fix_fields(THD *, Item **); - friend bool Item_param::fix_fields(THD *, Item **); friend void mark_select_range_as_dependent(THD*, st_select_lex*, st_select_lex*, Field*, Item*, Item_ident*); |