diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-21 14:56:47 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-21 14:56:47 +0200 |
| commit | d25fd437c4cb72da48f2b8d5db997c8090a929a3 (patch) | |
| tree | a6663172920de2720233513d97a02564d2b8fbd1 /storage/connect | |
| parent | c92f2606ea6c9ab519ff1d0313a54f4fac95ce33 (diff) | |
| download | mariadb-git-d25fd437c4cb72da48f2b8d5db997c8090a929a3.tar.gz | |
- Fix wrong return from ExecuteQuery
modified: storage/connect/jdbconn.cpp
- Suppress GCC warning
modified: storage/connect/tabjdbc.cpp
Diffstat (limited to 'storage/connect')
| -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 |