diff options
| author | monty@mysql.com <> | 2003-11-28 12:18:13 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-11-28 12:18:13 +0200 |
| commit | ede8169d24c56a4e264034b3a098477072532ca5 (patch) | |
| tree | e5a58d3f07e9cca109d78031822106ff2be7f6f8 /sql/item_subselect.h | |
| parent | 7733969bf65befdbf1fd4445ec6b7efa43b61492 (diff) | |
| download | mariadb-git-ede8169d24c56a4e264034b3a098477072532ca5.tar.gz | |
Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
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 3637e025d3c..8444dc7bf66 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -263,7 +263,7 @@ public: virtual ~subselect_engine() {}; // to satisfy compiler // set_thd should be called before prepare() - void set_thd(THD *thd) { this->thd= thd; } + void set_thd(THD *thd_arg) { thd= thd_arg; } THD * get_thd() { return thd; } virtual int prepare()= 0; virtual void fix_length_and_dec(Item_cache** row)= 0; @@ -328,11 +328,11 @@ protected: public: // constructor can assign THD because it will be called after JOIN::prepare - subselect_uniquesubquery_engine(THD *thd, st_join_table *tab_arg, + subselect_uniquesubquery_engine(THD *thd_arg, st_join_table *tab_arg, Item_subselect *subs, Item *where) :subselect_engine(subs, 0), tab(tab_arg), cond(where) { - set_thd(thd); + set_thd(thd_arg); } ~subselect_uniquesubquery_engine(); int prepare(); |