summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-01-06 11:32:40 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2015-01-06 11:32:40 +0100
commitd4bf64556ea8f8b5f4be052d683e87727aad872d (patch)
tree13e53692dec6d2d431c653c95adff4e2d6844c02 /storage
parentafd373c11951f48f7f9dde9990e7be2c76456559 (diff)
downloadmariadb-git-d4bf64556ea8f8b5f4be052d683e87727aad872d.tar.gz
- Typo to eliminate some GCC warnings
modified: storage/connect/odbconn.cpp storage/connect/plgdbsem.h
Diffstat (limited to 'storage')
-rw-r--r--storage/connect/odbconn.cpp2
-rw-r--r--storage/connect/plgdbsem.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp
index b9cf8054e3a..ec8be43b059 100644
--- a/storage/connect/odbconn.cpp
+++ b/storage/connect/odbconn.cpp
@@ -2453,7 +2453,7 @@ PQRYRES ODBConn::AllocateResult(PGLOBAL g)
/***********************************************************************/
int ODBConn::Rewind(char *sql, ODBCCOL *tocols)
{
- int rc, rbuf;
+ int rc, rbuf = -1;
if (!m_hstmt)
rbuf = -1;
diff --git a/storage/connect/plgdbsem.h b/storage/connect/plgdbsem.h
index b4af13c57cc..24090e98804 100644
--- a/storage/connect/plgdbsem.h
+++ b/storage/connect/plgdbsem.h
@@ -74,8 +74,8 @@ enum TABTYPE {TAB_UNDEF = 0, /* Table of undefined type */
TAB_PLG = 20, /* PLG NIY */
TAB_PIVOT = 21, /* PIVOT table */
TAB_VIR = 22, /* Virtual tables */
- TAB_JSON = 23, /* JSON tables */
- TAB_JSN = 24, /* Semi-json tables */
+// TAB_JSON = 23, /* JSON tables */
+// TAB_JSN = 24, /* Semi-json tables */
TAB_JCT = 25, /* Junction tables NIY */
TAB_DMY = 26, /* DMY Dummy tables NIY */
TAB_NIY = 27}; /* Table not implemented yet */