diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-21 14:28:21 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-21 14:28:21 +0200 |
| commit | 77dd5ece06904aa10c3fe05b9493cf3231edcd85 (patch) | |
| tree | 541f59e1cb01b35c0d56504f2921ca5f631ba0a1 | |
| parent | a982f59b9b7ed988d908fa75425c826d7e85e406 (diff) | |
| download | mariadb-git-77dd5ece06904aa10c3fe05b9493cf3231edcd85.tar.gz | |
- Fix wrong return from ExecuteQuery
modified: storage/connect/jdbconn.cpp
- Suppress GCC warning
modified: storage/connect/tabjdbc.cpp
| -rw-r--r-- | storage/connect/jdbconn.cpp | 2 | ||||
| -rw-r--r-- | storage/connect/tabjdbc.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/jdbconn.cpp b/storage/connect/jdbconn.cpp index 286d1141fe8..23bd64bfb88 100644 --- a/storage/connect/jdbconn.cpp +++ b/storage/connect/jdbconn.cpp @@ -1458,7 +1458,7 @@ int JDBConn::ExecuteQuery(char *sql) env->DeleteLocalRef(qry); } // endif xqid - return RC_OK; + return rc; } // end of ExecuteQuery /***********************************************************************/ diff --git a/storage/connect/tabjdbc.cpp b/storage/connect/tabjdbc.cpp index fa5f093bae6..f507e3df3ea 100644 --- a/storage/connect/tabjdbc.cpp +++ b/storage/connect/tabjdbc.cpp @@ -172,7 +172,7 @@ int JDBCDEF::ParseURL(PGLOBAL g, char *url, bool b) if (server->port) { char buf[16]; - sprintf(buf, "%d", server->port); + sprintf(buf, "%ld", server->port); strcat(strcat(Url, ":"), buf); } // endif port |