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

Fixed compiler warnings

Browse Source
This commit is contained in:
Michael Widenius 2014-09-12 14:49:24 +03:00
parent e36d6f03a4
commit fa51a22388
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/log_event.cc
View File

@ -1020,8 +1020,9 @@ Log_event::do_shall_skip(rpl_group_info *rgi)
Relay_log_info *rli= rgi->rli; Relay_log_info *rli= rgi->rli;
DBUG_PRINT("info", ("ev->server_id: %lu, ::server_id: %lu," DBUG_PRINT("info", ("ev->server_id: %lu, ::server_id: %lu,"
" rli->replicate_same_server_id: %d," " rli->replicate_same_server_id: %d,"
" rli->slave_skip_counter: %lu", " rli->slave_skip_counter: %llu",
(ulong) server_id, (ulong) global_system_variables.server_id, (ulong) server_id,
(ulong) global_system_variables.server_id,
rli->replicate_same_server_id, rli->replicate_same_server_id,
rli->slave_skip_counter)); rli->slave_skip_counter));
if ((server_id == global_system_variables.server_id && if ((server_id == global_system_variables.server_id &&

3
storage/connect/array.cpp
View File

@ -578,7 +578,7 @@ bool ARRAY::CanBeShort(void)
/***********************************************************************/ /***********************************************************************/
int ARRAY::Convert(PGLOBAL g, int k, PVAL vp) int ARRAY::Convert(PGLOBAL g, int k, PVAL vp)
{ {
int i, prec = 0; int i;
bool b = FALSE; bool b = FALSE;
PMBV ovblk = Valblk; PMBV ovblk = Valblk;
PVBLK ovblp = Vblp; PVBLK ovblp = Vblp;
@ -588,7 +588,6 @@ int ARRAY::Convert(PGLOBAL g, int k, PVAL vp)
switch (Type) { switch (Type) {
case TYPE_DOUBLE: case TYPE_DOUBLE:
prec = 2;
case TYPE_SHORT: case TYPE_SHORT:
case TYPE_INT: case TYPE_INT:
case TYPE_DATE: case TYPE_DATE:

2
storage/connect/tabmysql.cpp
View File

@ -905,7 +905,7 @@ bool TDBMYSQL::OpenDB(PGLOBAL g)
} // endif MakeInsert } // endif MakeInsert
if (m_Rc != RC_FX) { if (m_Rc != RC_FX) {
int rc; int rc __attribute__((unused));
char cmd[64]; char cmd[64];
int w; int w;

2
storage/connect/xindex.cpp
View File

@ -411,7 +411,7 @@ bool XINDEX::Make(PGLOBAL g, PIXDEF sxp)
kcp = new(g) KXYCOL(this); kcp = new(g) KXYCOL(this);
if (kcp->Init(g, colp, n, true, NULL)) if (kcp->Init(g, colp, n, true, 0))
return true; return true;
if (trace) if (trace)