mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
Fixed portability issue in my_thr_init.c (was added in my last push)
Fixed compiler warnings (detected by VC++): - Removed not used variables - Added casts - Fixed wrong assignments to bool - Fixed wrong calls with bool arguments - Added missing argument to store(longlong), which caused wrong store method to be called. client/mysqldump.c: Removed compiler warning heap/hp_clear.c: Removed compiler warning include/my_global.h: Removed compiler warning include/my_tree.h: Changed memory limits from int to ulong (Allowed me to get rid of some compiler warnings) myisam/mi_create.c: Removed compiler warning myisam/myisampack.c: Removed compiler warning mysys/base64.c: Removed compiler warning mysys/my_thr_init.c: Fixed portability issue (detected on windows) Added DBUG_ASSERT to detect if we call my_thread_end() too many times Don't wait if THR_thread_count == -1 (error condition) mysys/tree.c: Removed compiler warning sql/field.cc: Removed compiler warning Fixed wrong parameter to check_date() Added missing argument to store(longlong) sql/ha_archive.cc: Removed compiler warning sql/ha_federated.cc: Removed compiler warning sql/ha_innodb.cc: Removed not used variable sql/handler.cc: Removed not used variable Fixed wrong if (we didn't detect if rollback or commit failed). Not critical as value is not yet used sql/item.cc: Removed compiler warning sql/item_func.cc: Removed compiler warning sql/item_strfunc.cc: Removed compiler warning sql/item_timefunc.cc: Removed compiler warning sql/log.cc: Removed compiler warning sql/mysql_priv.h: Removed compiler warning sql/opt_range.cc: Removed compiler warning sql/password.c: Removed compiler warning sql/set_var.cc: Removed compiler warning sql/slave.cc: Removed compiler warning sql/sp.cc: Removed compiler warning sql/sp_cache.cc: Removed compiler warning sql/sp_head.cc: Removed compiler warning Adjusted argument to reserve() to not use up too much memory that we are probably not going to need sql/sql_acl.cc: Added missing argument to store(longlong) sql/sql_base.cc: Removed compiler warning sql/sql_db.cc: Removed compiler warning sql/sql_delete.cc: Removed compiler warning sql/sql_handler.cc: Removed not used variable sql/sql_lex.h: Removed not used variable sql/sql_prepare.cc: Removed not used variable sql/sql_rename.cc: Removed not used variable sql/sql_select.cc: Fixed that select_options are not 'cut' Removed some not used variables Removed compiler warnings by adding cast sql/sql_show.cc: Removed not used variables Added missing argument to store(longlong) Removed compiler warnings sql/sql_trigger.cc: Removed not used variables Added cast to remove compiler warnings sql/sql_update.cc: Fixed wrong set of bool variable sql/sql_view.cc: Removed not used variables Added cast to get rid of compiler warnings sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed wrong argument to check_date() Added casts to get rid of compiler warnings sql/sql_yacc.yy: Removed not used variable sql/uniques.cc: Changes memory size from uint to ulong Added casts to get rid of compiler warnings strings/ctype-simple.c: Fixed cast to get rid of compiler warnings
This commit is contained in:
parent
42fd48da99
commit
7191e77539
45 changed files with 168 additions and 163 deletions
|
|
@ -1249,7 +1249,6 @@ bool ha_federated::create_where_from_key(String *to,
|
|||
if (tmp.append(FEDERATED_CLOSEPAREN))
|
||||
DBUG_RETURN(1);
|
||||
|
||||
next_loop:
|
||||
if (store_length >= length)
|
||||
break;
|
||||
DBUG_PRINT("info", ("remainder %d", remainder));
|
||||
|
|
@ -1914,8 +1913,8 @@ int ha_federated::delete_row(const byte *buf)
|
|||
{
|
||||
DBUG_RETURN(stash_remote_error());
|
||||
}
|
||||
deleted+= mysql->affected_rows;
|
||||
records-= mysql->affected_rows;
|
||||
deleted+= (ha_rows) mysql->affected_rows;
|
||||
records-= (ha_rows) mysql->affected_rows;
|
||||
DBUG_PRINT("info",
|
||||
("rows deleted %ld rows deleted for all time %ld",
|
||||
(long) mysql->affected_rows, (long) deleted));
|
||||
|
|
@ -2270,7 +2269,6 @@ int ha_federated::rnd_next(byte *buf)
|
|||
int ha_federated::read_next(byte *buf, MYSQL_RES *result)
|
||||
{
|
||||
int retval;
|
||||
my_ulonglong num_rows;
|
||||
MYSQL_ROW row;
|
||||
DBUG_ENTER("ha_federated::read_next");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue