diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-09-12 14:49:24 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-09-12 14:49:24 +0300 |
| commit | fa51a22388135007bd6dff0ffa42ba3d90debd91 (patch) | |
| tree | c6ef029dc7de424b5f9ff83c6f3c10576a9b8ba7 /storage/connect | |
| parent | e36d6f03a4ea962f3771a76fa89991771be9f26c (diff) | |
| download | mariadb-git-fa51a22388135007bd6dff0ffa42ba3d90debd91.tar.gz | |
Fixed compiler warnings
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/array.cpp | 3 | ||||
| -rw-r--r-- | storage/connect/tabmysql.cpp | 2 | ||||
| -rwxr-xr-x | storage/connect/xindex.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
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) |