summaryrefslogtreecommitdiff
path: root/storage/connect/JdbcInterface.java
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2016-10-14 18:29:33 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2016-10-14 18:29:33 +0200
commitb7aee7dbe71cf77199e28e905469f0d9fb6d4a80 (patch)
tree9e73c51c3774b86a8c1bbe2047b7039630001d41 /storage/connect/JdbcInterface.java
parent9b20d606fb1afd0327356e7c78c2aea774dec3d4 (diff)
downloadmariadb-git-b7aee7dbe71cf77199e28e905469f0d9fb6d4a80.tar.gz
- Fix MDEV-10950. Null values not retrieved for numeric types.
Now the null is tested using the result set getObject method. modified: storage/connect/JdbcInterface.java modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h
Diffstat (limited to 'storage/connect/JdbcInterface.java')
-rw-r--r--storage/connect/JdbcInterface.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/JdbcInterface.java b/storage/connect/JdbcInterface.java
index e339c989113..34af8c4e013 100644
--- a/storage/connect/JdbcInterface.java
+++ b/storage/connect/JdbcInterface.java
@@ -692,11 +692,11 @@ public class JdbcInterface {
return 0;
} // end of TimestampField
- public String ObjectField(int n, String name) {
+ public Object ObjectField(int n, String name) {
if (rs == null) {
System.out.println("No result set");
} else try {
- return (n > 0) ? rs.getObject(n).toString() : rs.getObject(name).toString();
+ return (n > 0) ? rs.getObject(n) : rs.getObject(name);
} catch (SQLException se) {
SetErrmsg(se);
} //end try/catch