Merge branch '2.3' into 2.4

2020-05-13 11:04:18 +03:00
parent 4cc5fa115a b212117fd3
commit f5c118d27b
4 changed files with 9 additions and 1 deletions
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/tokenize.c
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/tokenize.c
@ -419,8 +419,13 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
    }
    case CC_BANG: {
      if( z[1]!='=' ){
+#ifdef MAXSCALE
+        *tokenType = TK_NOT;
+        return 1;
+#else
        *tokenType = TK_ILLEGAL;
        return 2;
+#endif
      }else{
        *tokenType = TK_NE;
        return 2;