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/event_data_objects.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/event_data_objects.cc')
-rw-r--r-- | sql/event_data_objects.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 0de90e4145b..ad7f0ab4e41 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -1095,7 +1095,7 @@ bool get_next_time(TIME *next, TIME *start, TIME *time_now, TIME *last_exec, DBUG_PRINT("error", ("negative difference")); DBUG_ASSERT(0); } - uint multiplier= seconds_diff / seconds; + uint multiplier= (uint) (seconds_diff / seconds); /* Increase the multiplier is the modulus is not zero to make round up. Or if time_now==start then we should not execute the same @@ -1128,7 +1128,7 @@ bool get_next_time(TIME *next, TIME *start, TIME *time_now, TIME *last_exec, directly with +1 we will be after the current date but it could be that we will be 1 month ahead, so 2 steps are necessary. */ - interval.month= (diff_months / months)*months; + interval.month= (ulong) ((diff_months / months)*months); /* Check if the same month as last_exec (always set - prerequisite) An event happens at most once per month so there is no way to @@ -1141,7 +1141,7 @@ bool get_next_time(TIME *next, TIME *start, TIME *time_now, TIME *last_exec, */ if (time_now->year == last_exec->year && time_now->month == last_exec->month) - interval.month+= months; + interval.month+= (ulong) months; tmp= *start; if ((ret= date_add_interval(&tmp, INTERVAL_MONTH, interval))) @@ -1150,7 +1150,7 @@ bool get_next_time(TIME *next, TIME *start, TIME *time_now, TIME *last_exec, /* If `tmp` is still before time_now just add one more time the interval */ if (my_time_compare(&tmp, time_now) == -1) { - interval.month+= months; + interval.month+= (ulong) months; tmp= *start; if ((ret= date_add_interval(&tmp, INTERVAL_MONTH, interval))) goto done; @@ -1283,7 +1283,7 @@ Event_queue_element::compute_next_execution_time() if (get_next_time(&next_exec, &starts, &time_now, last_executed.year? &last_executed:&starts, - expression, interval)) + (int) expression, interval)) goto err; /* There was previous execution */ @@ -1321,7 +1321,7 @@ Event_queue_element::compute_next_execution_time() { TIME next_exec; if (get_next_time(&next_exec, &starts, &time_now, &last_executed, - expression, interval)) + (int) expression, interval)) goto err; execute_at= next_exec; DBUG_PRINT("info",("Next[%lu]", @@ -1356,7 +1356,7 @@ Event_queue_element::compute_next_execution_time() TIME next_exec; if (get_next_time(&next_exec, &starts, &time_now, last_executed.year? &last_executed:&starts, - expression, interval)) + (int) expression, interval)) goto err; execute_at= next_exec; DBUG_PRINT("info",("Next[%lu]", @@ -1382,7 +1382,7 @@ Event_queue_element::compute_next_execution_time() TIME next_exec; if (get_next_time(&next_exec, &starts, &time_now, &last_executed, - expression, interval)) + (int) expression, interval)) goto err; if (my_time_compare(&ends, &next_exec) == -1) |