[ODBC-77] Fix and the testcase. Connector did not recognize ANALYZE

TABLE as query returning result. SImilar error fixed for EXPLAIN.

Author: lawrinn

ma_parse.c

@@ -168,6 +168,22 @@ enum enum_madb_query_type MADB_GetQueryType(MADB_Stmt *Stmt)
   {
     return MADB_QUERY_SHOW;
   }
+  if (_strnicmp(p, "ANALYZE", 7) == 0)
+  {
+    return MADB_QUERY_ANALYZE;
+  }
+  if (_strnicmp(p, "EXPLAIN", 7) == 0)
+  {
+    return MADB_QUERY_EXPLAIN;
+  }
+  if (_strnicmp(p, "CHECK", 5) == 0)
+  {
+    return MADB_QUERY_CHECK;
+  }
+  if (_strnicmp(p, "EXECUTE", 7) == 0)
+  {
+    return MADB_QUERY_EXECUTE;
+  }
 
   return MADB_QUERY_NO_RESULT;
 }

ma_parse.h

@@ -27,7 +27,11 @@ enum enum_madb_query_type { MADB_QUERY_NO_RESULT= 0, /* Default type for the que
                             MADB_QUERY_DELETE= SQL_DELETE,
                             MADB_QUERY_SELECT,
                             MADB_QUERY_SHOW,
-                            MADB_QUERY_CALL
+                            MADB_QUERY_CALL,
+                            MADB_QUERY_ANALYZE,
+                            MADB_QUERY_EXPLAIN,
+                            MADB_QUERY_CHECK,
+                            MADB_QUERY_EXECUTE
                           };
 
 #define QUERY_DOESNT_RETURN_RESULT(query_type) ((query_type) < MADB_QUERY_SELECT)

test/multistatement.c

@@ -198,7 +198,7 @@ ODBC_TEST(test_semicolon)
 /* Double quote inside single quotes caused error in parsing while*/
 ODBC_TEST(t_odbc_74)
 {
-  SQLCHAR ref[][4]={"\"", "'", "*/", "/*", "end"}, val[4];
+  SQLCHAR ref[][4]={"\"", "'", "*/", "/*", "end", "one", "two"}, val[4];
   unsigned int i;
 
   OK_SIMPLE_STMT(Stmt, "DROP TABLE IF EXISTS odbc74; CREATE TABLE odbc74(id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,\
@@ -210,6 +210,10 @@ ODBC_TEST(t_odbc_74)
                         INSERT INTO odbc74 (val) VALUES('/*');-- comment\"'; insert into non_existent values(1)\n\
                         INSERT INTO odbc74 (val) VALUES('end')\n\
                         # ;Unhappy comment at the end ");
+  OK_SIMPLE_STMT(Stmt, "-- comment ;1 \n\
+                        # comment ;2 \n\
+                        INSERT INTO odbc74 (val) VALUES('one');\
+                        INSERT INTO odbc74 (val) VALUES(\"two\");");
   OK_SIMPLE_STMT(Stmt, "SELECT val FROM odbc74 ORDER BY id");
 
   for (i= 0; i < sizeof(ref)/sizeof(ref[0]); ++i)

test/result2.c

@@ -1042,6 +1042,39 @@ ODBC_TEST(t_odbc58)
 }
 
 
+ODBC_TEST(t_odbc77)
+{
+  OK_SIMPLE_STMT(Stmt, "DROP table if exists t_odbc41");
+
+  OK_SIMPLE_STMT(Stmt, "ANALYZE TABLE non_existent");
+  CHECK_STMT_RC(Stmt, SQLFetch(Stmt));
+  CHECK_STMT_RC(Stmt, SQLFetch(Stmt));
+
+  EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_NO_DATA);
+  CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
+
+#ifdef MDEV_11966_FIXED
+  OK_SIMPLE_STMT(Stmt, "ANALYZE SELECT 1");
+  CHECK_STMT_RC(Stmt, SQLFetch(Stmt));
+  EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_NO_DATA);
+  CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
+#endif
+  OK_SIMPLE_STMT(Stmt, "EXPLAIN SELECT 1");
+  CHECK_STMT_RC(Stmt, SQLFetch(Stmt));
+  EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_NO_DATA);
+  CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));
+
+  /*CHECK is not preparable */
+  /*OK_SIMPLE_STMT(Stmt, "CHECK TABLE non_existent");
+  CHECK_STMT_RC(Stmt, SQLFetch(Stmt));
+  CHECK_STMT_RC(Stmt, SQLFetch(Stmt));
+  EXPECT_STMT(Stmt, SQLFetch(Stmt), SQL_NO_DATA);
+  CHECK_STMT_RC(Stmt, SQLFreeStmt(Stmt, SQL_CLOSE));*/
+
+  return OK;
+}
+
+
 MA_ODBC_TESTS my_tests[]=
 {
   {t_bug32420, "t_bug32420"},
@@ -1062,7 +1095,8 @@ MA_ODBC_TESTS my_tests[]=
   {t_bug11766437, "t_bug11766437"},
   {t_odbc29, "t_odbc-29"},
   {t_odbc41, "t_odbc-41-nors_after_rs"},
-  { t_odbc58, "t_odbc-58-numeric_after_blob" },
+  {t_odbc58, "t_odbc-58-numeric_after_blob"},
+  {t_odbc77, "t_odbc-77-analyze_table"},
   {NULL, NULL}
 };