diff options
| -rw-r--r-- | sql/log_event.cc | 5 | ||||
| -rw-r--r-- | storage/connect/array.cpp | 3 | ||||
| -rw-r--r-- | storage/connect/tabmysql.cpp | 2 | ||||
| -rwxr-xr-x | storage/connect/xindex.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 0f305836ff0..83eeb55bec8 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1020,8 +1020,9 @@ Log_event::do_shall_skip(rpl_group_info *rgi) Relay_log_info *rli= rgi->rli; DBUG_PRINT("info", ("ev->server_id: %lu, ::server_id: %lu," " rli->replicate_same_server_id: %d," - " rli->slave_skip_counter: %lu", - (ulong) server_id, (ulong) global_system_variables.server_id, + " rli->slave_skip_counter: %llu", + (ulong) server_id, + (ulong) global_system_variables.server_id, rli->replicate_same_server_id, rli->slave_skip_counter)); if ((server_id == global_system_variables.server_id && diff --git a/storage/connect/array.cpp b/storage/connect/array.cpp index 6cd175a0f0a..aca44087d44 100644 --- a/storage/connect/array.cpp +++ b/storage/connect/array.cpp @@ -578,7 +578,7 @@ bool ARRAY::CanBeShort(void) /***********************************************************************/ int ARRAY::Convert(PGLOBAL g, int k, PVAL vp) { - int i, prec = 0; + int i; bool b = FALSE; PMBV ovblk = Valblk; PVBLK ovblp = Vblp; @@ -588,7 +588,6 @@ int ARRAY::Convert(PGLOBAL g, int k, PVAL vp) switch (Type) { case TYPE_DOUBLE: - prec = 2; case TYPE_SHORT: case TYPE_INT: case TYPE_DATE: diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index d84f6c9aab4..c7170ac554b 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -905,7 +905,7 @@ bool TDBMYSQL::OpenDB(PGLOBAL g) } // endif MakeInsert if (m_Rc != RC_FX) { - int rc; + int rc __attribute__((unused)); char cmd[64]; int w; diff --git a/storage/connect/xindex.cpp b/storage/connect/xindex.cpp index 12781b2ac05..82eb94f038b 100755 --- a/storage/connect/xindex.cpp +++ b/storage/connect/xindex.cpp @@ -411,7 +411,7 @@ bool XINDEX::Make(PGLOBAL g, PIXDEF sxp) kcp = new(g) KXYCOL(this); - if (kcp->Init(g, colp, n, true, NULL)) + if (kcp->Init(g, colp, n, true, 0)) return true; if (trace) |