Merge branch '2.3' into 2.4

2020-08-17 17:30:55 +03:00 · 2020-08-17 17:30:55 +03:00 · c0ea4cae54
commit c0ea4cae54
parent eaac7881f0 9318319b96
1 changed files with 2 additions and 0 deletions
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/select.c
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/select.c
@ -122,7 +122,9 @@ Select *sqlite3SelectNew(
  pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) );
  if( pNew==0 ){
    assert( db->mallocFailed );
+#ifndef MAXSCALE
    pNew = &standin;
+#endif
  }
  if( pEList==0 ){
 #ifndef MAXSCALE