summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-11-28 12:18:13 +0200
committermonty@mysql.com <>2003-11-28 12:18:13 +0200
commitede8169d24c56a4e264034b3a098477072532ca5 (patch)
treee5a58d3f07e9cca109d78031822106ff2be7f6f8 /sql/item.h
parent7733969bf65befdbf1fd4445ec6b7efa43b61492 (diff)
downloadmariadb-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.h')
-rw-r--r--sql/item.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item.h b/sql/item.h
index 23b0cf018e1..a94a7a77597 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -830,14 +830,14 @@ public:
bool fix_fields(THD *, struct st_table_list *, Item **);
void print(String *str);
virtual bool basic_const_item() const { return true; }
- int save_in_field(Field *field, bool no_conversions)
+ int save_in_field(Field *field_arg, bool no_conversions)
{
if (!arg)
{
- field->set_default();
+ field_arg->set_default();
return 0;
}
- return Item_field::save_in_field(field, no_conversions);
+ return Item_field::save_in_field(field_arg, no_conversions);
}
table_map used_tables() const { return (table_map)0L; }
@@ -858,9 +858,9 @@ public:
bool fix_fields(THD *, struct st_table_list *, Item **);
void print(String *str);
virtual bool basic_const_item() const { return true; }
- int save_in_field(Field *field, bool no_conversions)
+ int save_in_field(Field *field_arg, bool no_conversions)
{
- return Item_field::save_in_field(field, no_conversions);
+ return Item_field::save_in_field(field_arg, no_conversions);
}
table_map used_tables() const { return (table_map)0L; }