diff options
author | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-30 03:40:42 +0200 |
---|---|---|
committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2006-11-30 03:40:42 +0200 |
commit | 1e87cfee19303a3ee3de027c27fef90c153ad4bf (patch) | |
tree | 7cc1a3e7f00427d01d2117c9b3c41231a827afd3 /sql/item_xmlfunc.cc | |
parent | c0c013e5b75b88081b6a8a693a777aaf6a574a66 (diff) | |
download | mariadb-git-1e87cfee19303a3ee3de027c27fef90c153ad4bf.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)
client/mysql.cc:
Removed not used variable
client/mysqldump.c:
Fixed compiler warning
client/mysqlslap.c:
Fixed compiler warning
client/mysqltest.c:
Fixed compiler warning
extra/replace.c:
Fixed compiler warning
include/my_global.h:
Fixed compiler warning
include/mysql_com.h:
Changed prototype for net_clear()
libmysql/libmysql.c:
Changed prototype for net_clear()
mysys/base64.c:
Fixed compiler warning (function definition and prototype didn't match)
mysys/my_thr_init.c:
AFter merge fixes
mysys/my_vle.c:
Fixed compiler warning
sql/event_data_objects.cc:
Fixed compiler warning
sql/event_scheduler.cc:
Removed not used variable
sql/field.cc:
Removed not used variables
Fixed compiler warning
sql/gen_lex_hash.cc:
Fixed compiler warning
sql/ha_partition.h:
Fixed compiler warning
sql/handler.cc:
Fixed compiler warning
sql/item.cc:
Fixed compiler warning
sql/item_create.cc:
Fixed compiler warning
sql/item_func.cc:
Fixed compiler warning
sql/item_strfunc.cc:
Fixed compiler warning
sql/item_timefunc.cc:
Fixed compiler warning
sql/item_xmlfunc.cc:
Fixed compiler warning
sql/log.cc:
Fixed compiler warning
sql/log_event.cc:
Fixed compiler warning
sql/log_event.h:
Fixed compiler warning
sql/mysql_priv.h:
Fixed too short 'select_type'
sql/net_serv.cc:
Added argument to net_clear() if we should empty the communication buffer.
sql/opt_range.cc:
Fixed compiler warning
sql/partition_info.cc:
Fixed compiler warning
sql/rpl_injector.h:
Fixed compiler warning
sql/set_var.cc:
Fixed compiler warning
sql/slave.cc:
Fixed compiler warning
sql/sp_head.cc:
Fixed compiler warning
sql/sql_base.cc:
Fixed compiler warning
sql/sql_db.cc:
Fixed compiler warning
sql/sql_delete.cc:
Fixed compiler warning
sql/sql_insert.cc:
Fixed compiler warning
sql/sql_lex.h:
Fixed compiler warning
sql/sql_parse.cc:
Fixed compiler warning
sql/sql_partition.cc:
Fixed compiler warning
sql/sql_plugin.cc:
Fixed compiler warning
sql/sql_prepare.cc:
Fixed compiler warning
sql/sql_rename.cc:
Fixed compiler warning
sql/sql_select.cc:
Fixed compiler warning
sql/sql_show.cc:
Fixed compiler warning
sql/sql_table.cc:
Fixed compiler warning
sql/sql_trigger.cc:
Fixed compiler warning
sql-common/client.c:
Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
sql-common/my_time.c:
Fixed compiler warning
sql/sql_union.cc:
Fixed compiler warning
sql/sql_update.cc:
Fixed compiler warning
sql/sql_view.cc:
Fixed compiler warning
sql/sql_yacc.yy:
Fixed compiler warning
sql/table.cc:
Fixed compiler warning
storage/archive/azio.c:
Fixed compiler warning
storage/csv/ha_tina.cc:
Removed not used code
storage/myisam/mi_unique.c:
Fixed compiler warning
storage/ndb/include/util/OutputStream.hpp:
Fixed compiler warning
storage/ndb/include/util/SocketAuthenticator.hpp:
Fixed compiler warning
storage/ndb/src/kernel/vm/Pool.hpp:
Fixed compiler warning
strings/ctype-simple.c:
Fixed compiler warning
strings/my_strchr.c:
Fixed compiler warning
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++); } |