Bug#35861516 Ndb : DbUtil test class only supports prepared statements

Follow up fix for problem with AtrtClient which attempted to read a
number which had been saved only as a string.

Improve test case to check that both prepared and basic protcol returns
same values and that they are save in same format where expected.

In general the basic protocol returns all values as strings which
differs against the prepared statement protocol, thus the mappings are
not always identical  but it seems like the basic protocol currently
have a more resilient implementation.

Change-Id: Idf36139e4cf82d93cc9215a63ad516b8ffd76887

Author: blaudden

storage/ndb/test/include/SqlClient.hpp

@@ -50,6 +50,8 @@ class SqlResultSet : public Properties {
   void clear();
 
   SqlResultSet();
+  SqlResultSet(SqlResultSet &) = delete;
+  SqlResultSet(SqlResultSet &&) = delete;
   ~SqlResultSet();
 
   const char *column(const char *col_name);

storage/ndb/test/ndbapi/testNDBT.cpp

@@ -155,32 +155,46 @@ int runTestSqlClient(NDBT_Context *ctx, NDBT_Step *step) {
     while (result.next()) {
     }
 
-    // Select second row from sql_client_test
-    Properties args;
-    args.put("0", 2);
-    if (!sql.doQuery("SELECT * FROM sql_client_test WHERE a=?", args, result))
-      return NDBT_FAILED;
-    result.print();
-
-    result.reset();
-    while (result.next()) {
-      ndbout << "a: " << result.columnAsInt("a") << endl
-             << "b: " << result.column("b") << endl
-             << "c: " << result.columnAsLong("c") << endl;
-      if (result.columnAsInt("a") != 2) {
-        ndbout << "hepp1" << endl;
-        return NDBT_FAILED;
-      }
-
-      if (strcmp(result.column("b"), "bye")) {
-        ndbout << "hepp2" << endl;
+    {
+      auto check_result = [](SqlResultSet &result) {
+        result.reset();
+        while (result.next()) {
+          ndbout << "a: " << result.columnAsInt("a") << endl
+                 << "b: " << result.column("b") << endl
+                 << "c: " << result.columnAsLong("c") << endl;
+          if (result.columnAsInt("a") != 2) {
+            ndbout << "Unexpected value for a" << endl;
+            return false;
+          }
+
+          if (strcmp(result.column("b"), "bye")) {
+            ndbout << "Unexpected value for b" << endl;
+            return false;
+          }
+
+          if (result.columnAsLong("c") != 9000000000ULL) {
+            ndbout << "Unexpected value for c" << endl;
+            return false;
+          }
+        }
+        return true;
+      };
+
+      // Select second row from sql_client_test using placeholders and check
+      // expected result, this will use prepared statement behind the scenes
+      Properties args;
+      args.put("0", 2);
+      if (!sql.doQuery("SELECT * FROM sql_client_test WHERE a=?", args, result))
         return NDBT_FAILED;
-      }
+      result.print();
+      if (!check_result(result)) return NDBT_FAILED;
 
-      if (result.columnAsLong("c") != 9000000000ULL) {
-        ndbout << "hepp3" << endl;
+      // Select second row from sql_client_test without placeholders and check
+      // expected result
+      if (!sql.doQuery("SELECT * FROM sql_client_test WHERE a=2", result))
         return NDBT_FAILED;
-      }
+      result.print();
+      if (!check_result(result)) return NDBT_FAILED;
     }
 
     if (sql.selectCountTable("sql_client_test") != 2) {

storage/ndb/test/src/SqlClient.cpp

@@ -433,6 +433,15 @@ bool SqlClient::runQueryBasic(const char *sql, SqlResultSet &rows) {
             // Save as Uint64 in result
             curr.put64(fields[i].name, std::stoull(field_data));
             break;
+
+          case MYSQL_TYPE_TINY:
+          case MYSQL_TYPE_SHORT:
+          case MYSQL_TYPE_INT24:
+          case MYSQL_TYPE_LONG:
+            // Save as Uint32 in result
+            curr.put(fields[i].name, std::stoul(field_data));
+            break;
+
           default:
             // Save as string in result
             curr.put(fields[i].name, field_data);