diff options
| author | drh <> | 2022-05-02 20:14:26 +0000 |
|---|---|---|
| committer | drh <> | 2022-05-02 20:14:26 +0000 |
| commit | 689f1b924611939363e4a593c10fbce56a8ff1b7 (patch) | |
| tree | b873ce7fc17cfdd4843a543f0d88c79d685c8246 /src | |
| parent | 63879a2c995c637c14a8f3aa1cee4e84dace56d7 (diff) | |
| parent | 56f38db70037d5211cb9ec5a7acae51db16e6b77 (diff) | |
| download | sqlite-689f1b924611939363e4a593c10fbce56a8ff1b7.tar.gz sqlite-689f1b924611939363e4a593c10fbce56a8ff1b7.zip | |
Merge trunk fixes into the right-join branch.
FossilOrigin-Name: e01f4c05c21e89dcc7985e00874f288d9ba5d5d932f7284f8d970bd3145ac0c2
Diffstat (limited to 'src')
| -rw-r--r-- | src/sqliteInt.h | 1 | ||||
| -rw-r--r-- | src/treeview.c | 1 | ||||
| -rw-r--r-- | src/wherecode.c | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index c64aa3c01..90c931efe 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1781,6 +1781,7 @@ struct sqlite3 { #define SQLITE_BalancedMerge 0x00200000 /* Balance multi-way merges */ #define SQLITE_ReleaseReg 0x00400000 /* Use OP_ReleaseReg for testing */ #define SQLITE_FlttnUnionAll 0x00800000 /* Disable the UNION ALL flattener */ + /* TH3 expects this value ^^^^^^^^^^ See flatten04.test */ #define SQLITE_AllOpts 0xffffffff /* All optimizations */ /* diff --git a/src/treeview.c b/src/treeview.c index b9d65e1ac..f314ea672 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -462,6 +462,7 @@ void sqlite3TreeViewWindow(TreeView *pView, const Window *pWin, u8 more){ ** Generate a human-readable explanation for a Window Function object */ void sqlite3TreeViewWinFunc(TreeView *pView, const Window *pWin, u8 more){ + if( pWin==0 ) return; sqlite3TreeViewPush(&pView, more); sqlite3TreeViewLine(pView, "WINFUNC %s(%d)", pWin->pWFunc->zName, pWin->pWFunc->nArg); diff --git a/src/wherecode.c b/src/wherecode.c index d4470ac4d..6f5a85386 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -1259,7 +1259,6 @@ static int whereIndexExprTransNode(Walker *p, Expr *pExpr){ pExpr->op = TK_COLUMN; pExpr->iTable = pX->iIdxCur; pExpr->iColumn = pX->iIdxCol; - testcase( ExprHasProperty(pExpr, EP_Skip) ); testcase( ExprHasProperty(pExpr, EP_Unlikely) ); ExprClearProperty(pExpr, EP_Skip|EP_Unlikely|EP_WinFunc|EP_Subrtn); pExpr->y.pTab = 0; |