From c03f6aa5e553c09819c42c8520fdb409741a3603 Mon Sep 17 00:00:00 2001
From: Lawrin Novitsky <lawrin.novitsky@mariadb.com>
Date: Mon, 30 Nov 2020 14:42:22 +0100
Subject: [PATCH] Build fix

Lately to fix one test build with certain VS version, not portable
change has been made, that broke build on other platforms.

Fix of couple of tests for older server versions.
---
 test/unit/bugs/bugs.cpp         |  6 +++++-
 test/unit/classes/statement.cpp | 13 ++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/test/unit/bugs/bugs.cpp b/test/unit/bugs/bugs.cpp
index 7b5098d..d964253 100644
--- a/test/unit/bugs/bugs.cpp
+++ b/test/unit/bugs/bugs.cpp
@@ -545,7 +545,7 @@ void bugs::bug72700()
     res.reset(stmt->getResultSet());
     checkResultSetScrolling(res);
     ResultSetMetaData meta(res->getMetaData());
-    ASSERT_EQUALS((getServerVersion(con) < 102000 || getServerVersion(con) > 103000) ? sql::Types::LONGVARCHAR : sql::Types::VARCHAR, meta->getColumnType(1));
+    ASSERT_EQUALS((getServerVersion(con) > 103000) ? sql::Types::LONGVARCHAR : sql::Types::VARCHAR, meta->getColumnType(1));
     ASSERT_EQUALS("LONGTEXT", meta->getColumnTypeName(1));
   }
   catch (::sql::SQLException & /*e*/)
@@ -1096,6 +1096,10 @@ void bugs::bug21152054()
 
 void bugs::bug22292073()
 {
+  if ((getServerVersion(con) < 102000))
+  {
+    SKIP("Server does not support tested functionality(JSON type)")
+  }
   stmt->execute("DROP TABLE IF EXISTS bug22292073");
   stmt->execute("create table bug22292073 (jdoc JSON);" );
   stmt->execute("insert into bug22292073 values('{ \"name\": \"abc\", \"age\": 1 , \"misc\":\
diff --git a/test/unit/classes/statement.cpp b/test/unit/classes/statement.cpp
index 4ab7197..a0bf28d 100644
--- a/test/unit/classes/statement.cpp
+++ b/test/unit/classes/statement.cpp
@@ -616,6 +616,7 @@ void statement::queryTimeout()
 
 void statement::addBatch()
 {
+  Statement st2(con->createStatement());
   stmt->executeUpdate("DROP TABLE IF EXISTS testAddBatch");
   stmt->executeUpdate("CREATE TABLE testAddBatch "
                       "(id int not NULL)");
@@ -626,12 +627,7 @@ void statement::addBatch()
 
   const sql::Ints& batchRes= stmt->executeBatch();
 
-  ASSERT_EQUALS(3UI64, static_cast<uint64_t>(batchRes.size()));
-  ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[0]);
-  ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[1]);
-  ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[2]);
-
-  res.reset(stmt->executeQuery("SELECT MIN(id), MAX(id), SUM(id), count(*) FROM testAddBatch"));
+  res.reset(st2->executeQuery("SELECT MIN(id), MAX(id), SUM(id), count(*) FROM testAddBatch"));
 
   ASSERT(res->next());
 
@@ -639,9 +635,12 @@ void statement::addBatch()
   ASSERT_EQUALS(3, res->getInt(2));
   ASSERT_EQUALS(6, res->getInt(3));
   ASSERT_EQUALS(3, res->getInt(4));
+  ASSERT_EQUALS(3ULL, static_cast<uint64_t>(batchRes.size()));
+  ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[0]);
+  ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[1]);
+  ASSERT_EQUALS(static_cast<int32_t>(sql::Statement::SUCCESS_NO_INFO), batchRes[2]);
 
   stmt->executeUpdate("DROP TABLE IF EXISTS testAddBatch");
-
 }
 
 } /* namespace statement */