diff options
author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 03:40:42 +0200 |
---|---|---|
committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 03:40:42 +0200 |
commit | 3a35c30027ed27bf6d2f457168fab2e4ef9e198e (patch) | |
tree | 7cc1a3e7f00427d01d2117c9b3c41231a827afd3 /sql/item.cc | |
parent | 717284b85cfdaeacb0e28177e13cf6fd24f36a3b (diff) | |
download | mariadb-git-3a35c30027ed27bf6d2f457168fab2e4ef9e198e.tar.gz |
Fixed compiler warnings (Mostly VC++):
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs
Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
Diffstat (limited to 'sql/item.cc')
-rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index e15672e4d45..356f262a9e4 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1542,7 +1542,7 @@ bool agg_item_collations_for_comparison(DTCollation &c, const char *fname, bool agg_item_charsets(DTCollation &coll, const char *fname, Item **args, uint nargs, uint flags, int item_sep) { - Item **arg, **last, *safe_args[2]; + Item **arg, *safe_args[2]; LINT_INIT(safe_args[0]); LINT_INIT(safe_args[1]); @@ -5739,7 +5739,7 @@ void Item_trigger_field::set_required_privilege(bool rw) } -bool Item_trigger_field::set_value(THD *thd, sp_rcontext */*ctx*/, Item **it) +bool Item_trigger_field::set_value(THD *thd, sp_rcontext * /*ctx*/, Item **it) { Item *item= sp_prepare_func_item(thd, it); |