summaryrefslogtreecommitdiff
path: root/sql/item_subselect.h
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2006-12-15 00:51:37 +0200
committermonty@mysql.com/narttu.mysql.fi <>2006-12-15 00:51:37 +0200
commit88dd873de0d5dc6e8f262268f925596a60b58704 (patch)
tree142bd488523fec48817d9fb2194f1a608eec00fc /sql/item_subselect.h
parent601e6f4b2a78921304bc1d779991c615ee229f89 (diff)
downloadmariadb-git-88dd873de0d5dc6e8f262268f925596a60b58704.tar.gz
Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions - Added #ifdef around code that is not used - Renamed variables and functions to avoid conflicts - Removed some not used arguments Fixed some class/struct warnings in ndb Added define IS_LONGDATA() to simplify code in libmysql.c I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
Diffstat (limited to 'sql/item_subselect.h')
-rw-r--r--sql/item_subselect.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index f1be99353cc..90c3ddd66e8 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();
@@ -474,10 +474,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,
bool chk_null)
- :subselect_uniquesubquery_engine(thd, tab_arg, subs, where),
+ :subselect_uniquesubquery_engine(thd_arg, tab_arg, subs, where),
check_null(chk_null)
{}
int exec(bool full_scan);