diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-03-30 14:32:53 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-03-30 14:32:53 +0200 |
| commit | f17bba4e2d93fe8343bc1230ef9ef2248cd80246 (patch) | |
| tree | 6d4d58f868c686f29d5acf8aefd03ffdf2bb27cf /sql/item_subselect.h | |
| parent | 8d8cb24efb8dd763c44bbf7b97dfe719e0550023 (diff) | |
| parent | ed4022bdd165ca4da93e0d3f7520819b1e10fe00 (diff) | |
| download | mariadb-git-f17bba4e2d93fe8343bc1230ef9ef2248cd80246.tar.gz | |
Merge
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item.cc:
SCCS merged
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 4661fae81da..1adefb6492e 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -120,6 +120,7 @@ public: 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 */ |