diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2018-03-27 23:17:24 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2018-03-27 23:17:24 +0200 |
| commit | 3bd6e68a4235706caada20f944f656365ad8ce3e (patch) | |
| tree | 60379573bb378f8fb8e1b192ba78a5d52cfede51 | |
| parent | a0f47c39b7a706ad8fc4770af87ac7187aaf3ffd (diff) | |
| parent | 494fb254e7f80770d91a5f4b97b0fe3f263aea3c (diff) | |
| download | mariadb-git-3bd6e68a4235706caada20f944f656365ad8ce3e.tar.gz | |
Merge branch 'ob-10.1' into 10.1
| -rw-r--r-- | storage/connect/tabjdbc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabjdbc.cpp b/storage/connect/tabjdbc.cpp index adbfb2168ae..275b5edaeae 100644 --- a/storage/connect/tabjdbc.cpp +++ b/storage/connect/tabjdbc.cpp @@ -572,7 +572,7 @@ bool TDBJDBC::OpenDB(PGLOBAL g) if (Memory < 3) { // Method will depend on cursor type - if ((Rbuf = Jcp->Rewind(Query->GetStr())) < 0) + if ((Rbuf = Query ? Jcp->Rewind(Query->GetStr()) : 0) < 0) if (Mode != MODE_READX) { Jcp->Close(); return true; |