diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-02-21 14:07:08 +0200 |
| commit | 26aa385bc5278ec0ae842cf6558d8fd32b6876f1 (patch) | |
| tree | 57fb0c9c6c3686011b021c42671cf5065cdc0cf6 /sql/item_subselect.h | |
| parent | 37cedb7efad7568b496eb981e40a0910c0e22494 (diff) | |
| parent | 222e128b34e7cfa67270a03c3d690d81dc0bc17b (diff) | |
| download | mariadb-git-26aa385bc5278ec0ae842cf6558d8fd32b6876f1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 25a0326f8b6..485a896c1c7 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -163,7 +163,7 @@ public: void fix_length_and_dec(); uint cols(); - Item* el(uint i) { return my_reinterpret_cast(Item*)(row[i]); } + Item* element_index(uint i) { return my_reinterpret_cast(Item*)(row[i]); } Item** addr(uint i) { return (Item**)row + i; } bool check_cols(uint c); bool null_inside(); @@ -531,10 +531,10 @@ class subselect_indexsubquery_engine: public subselect_uniquesubquery_engine public: // constructor can assign THD because it will be called after JOIN::prepare - subselect_indexsubquery_engine(THD *thd, st_join_table *tab_arg, + subselect_indexsubquery_engine(THD *thd_arg, st_join_table *tab_arg, Item_subselect *subs, Item *where, Item *having_arg, bool chk_null) - :subselect_uniquesubquery_engine(thd, tab_arg, subs, where), + :subselect_uniquesubquery_engine(thd_arg, tab_arg, subs, where), check_null(chk_null), having(having_arg) {} |