Reverted erroneous change made in previous commits that broke the compilation.

Fixed SQLCancelHandle test on non-Windows platforms for the case of RS streaming
(on Windows it was fixed before)

Author: lawrinn

driver/class/ServerSidePreparedStatement.cpp

@@ -328,7 +328,7 @@ namespace mariadb
   {
     // Assuming paramset skip is set in the indicator of 1st column
     if (bind->u.indicator && *bind->u.indicator == STMT_INDICATOR_IGNORE_ROW) {
-      return '\0';
+      return NULL;
     }
     // We can't let the callback to throw - we have to intercept, as otherwise we are guaranteed to have
     // the protocol broken
@@ -360,7 +360,7 @@ namespace mariadb
     {
       return (my_bool*)&error;
     }
-    return '\0';
+    return NULL;
   }
 
 

test/basic.c

@@ -957,7 +957,7 @@ ODBC_TEST(sqlcancel_threaded)
 
   pthread_create(&thread, NULL, cancel_in_one_second, Stmt);
 
-  if (IsMysql || (ForwardOnly == TRUE && NoCache == TRUE))
+  if (IsMysql || RSSTREAMING)
   {
     /**/
     OK_SIMPLE_STMT(Stmt, "SELECT SLEEP(5)");
@@ -1021,16 +1021,24 @@ ODBC_TEST(sqlcancelhandle)
   }
   else
   {
-    EXPECT_STMT(Stmt, SQLExecDirect(Stmt, "SELECT SLEEP(5)", SQL_NTS), SQL_ERROR);
+    if (RSSTREAMING)
+    {
+      OK_SIMPLE_STMT(Stmt, "SELECT SLEEP(5)");
+      EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_ERROR);
+    }
+    else
+    {
+      EXPECT_STMT(Stmt, SQLExecDirect(Stmt, "SELECT SLEEP(5)", SQL_NTS), SQL_ERROR);
+    }
   }
-
   pthread_join(thread, NULL);
-
   return OK;
 }
 #endif  // ifndef HAVE_NOT_SQLCANCELHANDLE
 #endif  // ifdef _WIN32
 
+// Not sure what is this test about. Maybe that SQLDescribeCol does not crash/return error
+// with given parameters combination. Otherwise looks useless.
 ODBC_TEST(t_describe_nulti)
 {
   SQLHENV   henv1;