1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some compiler warnings

Browse Source
This commit is contained in:
Michael Widenius 2017-06-20 18:30:00 +03:00 committed by Sergei Golubchik
parent f71bed08ca
commit 9e1cc831f2
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/item_func.cc
View File

@ -3651,6 +3651,7 @@ longlong Item_master_gtid_wait::val_int()
{ {
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
longlong result= 0; longlong result= 0;
String *gtid_pos __attribute__((unused)) = args[0]->val_str(&value);
if (args[0]->null_value) if (args[0]->null_value)
{ {
@ -3660,7 +3661,6 @@ longlong Item_master_gtid_wait::val_int()
null_value=0; null_value=0;
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
String *gtid_pos = args[0]->val_str(&value);
THD* thd= current_thd; THD* thd= current_thd;
longlong timeout_us; longlong timeout_us;
@ -3670,7 +3670,9 @@ longlong Item_master_gtid_wait::val_int()
timeout_us= (longlong)-1; timeout_us= (longlong)-1;
result= rpl_global_gtid_waiting.wait_for_pos(thd, gtid_pos, timeout_us); result= rpl_global_gtid_waiting.wait_for_pos(thd, gtid_pos, timeout_us);
#endif #else
null_value= 0;
#endif /* REPLICATION */
return result; return result;
} }

3
sql/sql_parse.cc
View File

@ -1288,7 +1288,8 @@ bool do_command(THD *thd)
mysql_mutex_lock(&thd->LOCK_wsrep_thd); mysql_mutex_lock(&thd->LOCK_wsrep_thd);
if (thd->wsrep_conflict_state == MUST_ABORT) if (thd->wsrep_conflict_state == MUST_ABORT)
{ {
DBUG_PRINT("wsrep",("aborted for wsrep rollback: %lu", thd->real_id)); DBUG_PRINT("wsrep",("aborted for wsrep rollback: %lu",
(ulong) thd->real_id));
wsrep_client_rollback(thd); wsrep_client_rollback(thd);
} }
mysql_mutex_unlock(&thd->LOCK_wsrep_thd); mysql_mutex_unlock(&thd->LOCK_wsrep_thd);

2
sql/wsrep_mysqld.cc
View File

@ -1945,7 +1945,7 @@ static bool abort_replicated(THD *thd)
bool ret_code= false; bool ret_code= false;
if (thd->wsrep_query_state== QUERY_COMMITTING) if (thd->wsrep_query_state== QUERY_COMMITTING)
{ {
WSREP_DEBUG("aborting replicated trx: %lu", thd->real_id); WSREP_DEBUG("aborting replicated trx: %lu", (ulong) thd->real_id);
(void)wsrep_abort_thd(thd, thd, TRUE); (void)wsrep_abort_thd(thd, thd, TRUE);
ret_code= true; ret_code= true;

4
storage/connect/jmgoconn.cpp
View File

@ -730,7 +730,7 @@ int JMgoConn::DocUpdate(PGLOBAL g, PTDB tdbp)
return RC_FX; return RC_FX;
if (env->CallBooleanMethod(job, docaddid, updlist, jkey, val)) if (env->CallBooleanMethod(job, docaddid, updlist, jkey, val))
return NULL; return 0;
env->DeleteLocalRef(jkey); env->DeleteLocalRef(jkey);
} // endfor colp } // endfor colp
@ -740,7 +740,7 @@ int JMgoConn::DocUpdate(PGLOBAL g, PTDB tdbp)
jkey = env->NewStringUTF("$set"); jkey = env->NewStringUTF("$set");
if (env->CallBooleanMethod(job, docaddid, upd, jkey, updlist)) if (env->CallBooleanMethod(job, docaddid, upd, jkey, updlist))
return NULL; return 0;
env->DeleteLocalRef(jkey); env->DeleteLocalRef(jkey);

2
storage/connect/myconn.cpp
View File

@ -139,7 +139,7 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
unsigned int length[] = {0, 4, 0, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0}; unsigned int length[] = {0, 4, 0, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0};
PCSZ fmt; PCSZ fmt;
char *fld, *colname, *chset, v, buf[128], uns[16], zero[16]; char *fld, *colname, *chset, v, buf[128], uns[16], zero[16];
int i, n, nf, ncol = sizeof(buftyp) / sizeof(int); int i, n, nf=0, ncol = sizeof(buftyp) / sizeof(int);
int len, type, prec, rc, k = 0; int len, type, prec, rc, k = 0;
bool b; bool b;
PQRYRES qrp; PQRYRES qrp;

2
support-files/compiler_warnings.supp
View File

@ -146,6 +146,8 @@
.*/storage/connect/xindex\.cpp: ignoring return value of .*/storage/connect/xindex\.cpp: ignoring return value of
.*/storage/connect/value\.cpp: always false : 1000-1020 .*/storage/connect/value\.cpp: always false : 1000-1020
.*/storage/connect/json\.cpp: might be clobbered by .*/storage/connect/json\.cpp: might be clobbered by
.*/storage/connect/filemdbf\.cpp: ignoring return value.*fwrite
.*/storage/connect/value\.cpp: .*comparison is always false due to limited range
# #
# mroonga # mroonga