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_xmlfunc.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_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index 21239a13735..966bae43984 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -777,7 +777,7 @@ String *Item_nodeset_func_elementbyindex::val_nodeset(String *nodeset) ((XPathFilter*)(&nodeset_func->context_cache))->append_element(flt->num, flt->pos, size); - int index= args[1]->val_int() - 1; + int index= (int) (args[1]->val_int()) - 1; if (index >= 0 && (flt->pos == (uint) index || args[1]->is_bool_func())) ((XPathFilter*)nodeset)->append_element(flt->num, pos++); } |