Fix of SQLCanclel testcase, that would fail in case of RS streaming

on linux.

test/basic.c

@@ -901,10 +901,20 @@ ODBC_TEST(sqlcancel)
 
   pthread_create(&thread, NULL, cancel_in_one_second, Stmt);
 
-  /* Error "execution was interrupted" is returned when it's killed,
-     "SLEEP(n) returns 1 when it is killed" - that is probably for older versions. Need to verify. */
-  EXPECT_STMT(Stmt, SQLExecDirect(Stmt, "SELECT SLEEP(5)", SQL_NTS), SQL_ERROR);
-
+  if (ForwardOnly == TRUE && NoCache == TRUE)
+  {
+    /**/
+    OK_SIMPLE_STMT(Stmt, "SELECT SLEEP(5)");
+    EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_ERROR);
+    /* is_num(my_fetch_int(Stmt, 1), 1);*/
+    CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
+  }
+  else
+  {
+    /* Error "execution was interrupted" is returned when it's killed,
+       "SLEEP(n) returns 1 when it is killed" - that is probably for older versions. Need to verify. */
+    EXPECT_STMT(Stmt, SQLExecDirect(Stmt, "SELECT SLEEP(5)", SQL_NTS), SQL_ERROR);
+  }
   pthread_join(thread, NULL);
 
   return OK;

test/multistatement.c

@@ -758,19 +758,6 @@ ODBC_TEST(t_odbc375)
 }
 
 
-ODBC_TEST(t_odbc399)
-{
-  OK_SIMPLE_STMT(Stmt, "/*!80019 SELECT * FROM information_schema.applicable_roles ORDER BY host, user */");
-  //EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_NO_DATA);
-  CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
-  CHECK_STMT_RC(Stmt, SQLPrepare(Stmt, "/*!80019 SELECT * FROM information_schema.applicable_roles ORDER BY host, user */", SQL_NTS));
-  CHECK_STMT_RC(Stmt, SQLExecute(Stmt));
-  //EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_NO_DATA);
-  CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
-  return OK;
-}
-
-
 MA_ODBC_TESTS my_tests[]=
 {
   {test_multi_statements, "test_multi_statements"},
@@ -789,7 +776,6 @@ MA_ODBC_TESTS my_tests[]=
   {t_odbc219, "t_odbc219"},
   {test_autocommit, "test_autocommit"},
   {t_odbc375, "t_odbc375_reStoreError"},
-  {t_odbc399, "t_odbc399_commentQuery"},
   {NULL, NULL}
 };