Merge branch 'ob-10.1' into 10.1

MariaDB · Mar 27, 2018 · 3bd6e68 · 3bd6e68
2 parents a0f47c3 + 494fb25
commit 3bd6e68
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;