Merge branch '2.3' into 2.4

2020-12-16 10:06:38 +02:00
parent 4dd057d99d 2b8d5076e2
commit f496ab07eb
2 changed files with 30 additions and 2 deletions
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/tokenize.c
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/tokenize.c
@ -679,7 +679,7 @@ int sqlite3GetToken(const unsigned char *z, int *tokenType){
        if (pParse) {
          if (z != (const unsigned char *)pParse->zTail) {
            const char *p = (const char*)z - 1;
-            while ((p != pParse->zTail) && sqlite3Isspace(*p)) {
+            while ((p != pParse->zTail) && sqlite3Isspace(*p) && *p != '\n') {
              --p;
            }