diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-01 15:23:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-01 15:23:18 +0200 |
| commit | ec40980ddd921a3a765c23cc430c9c219e48ea85 (patch) | |
| tree | 6553832d3d3fb4b2cb39aea6a1d69e54275f6eb2 /storage/connect/jdbconn.cpp | |
| parent | 6801f80aface011811d2978f86c03a25ca7b9165 (diff) | |
| parent | 9c72963d2aef783cae652b5b8ac01f7aa2bcb43a (diff) | |
| download | mariadb-git-ec40980ddd921a3a765c23cc430c9c219e48ea85.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/connect/jdbconn.cpp')
| -rw-r--r-- | storage/connect/jdbconn.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/storage/connect/jdbconn.cpp b/storage/connect/jdbconn.cpp index e0aca3333e6..2cb75e0adc1 100644 --- a/storage/connect/jdbconn.cpp +++ b/storage/connect/jdbconn.cpp @@ -1196,9 +1196,14 @@ int JDBConn::GetResultSize(PCSZ sql, PCOL colp) if ((rc = ExecuteQuery(sql)) != RC_OK) return -1; - if ((rc = Fetch()) > 0) - SetColumnValue(1, NULL, colp->GetValue()); - else + if ((rc = Fetch()) > 0) { + try { + SetColumnValue(1, NULL, colp->GetValue()); + } catch (...) { + return -4; + } // end catch + + } else return -2; if ((rc = Fetch()) != 0) |