Fossil SCM

Merge in recent patches to the SQLite 3.8.5 beta.

drh 2014-06-03 15:17 trunk
Commit 2ddb51c08f91216ceeb928d274ad935e9debc8fe
Parent a01e2d147f15a62…
2 files changed +1 -7 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+1 -7
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -222,11 +222,11 @@
222222
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
223223
 ** [sqlite_version()] and [sqlite_source_id()].
224224
 */
225225
 #define SQLITE_VERSION "3.8.5"
226226
 #define SQLITE_VERSION_NUMBER 3008005
227
-#define SQLITE_SOURCE_ID "2014-06-02 11:26:33 9f18b303cd1bc5779d82669884f802c7889b4947"
227
+#define SQLITE_SOURCE_ID "2014-06-03 14:42:34 6d81805298ea882f5fee99504d5a95f1a762a90b"
228228
229229
 /*
230230
 ** CAPI3REF: Run-Time Library Version Numbers
231231
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
232232
 **
@@ -101819,13 +101819,10 @@
101819101819
 }else{
101820101820
 sqlite3VdbeAddOp2(v, OP_Next, iTab, addr); VdbeCoverage(v);
101821101821
 }
101822101822
 if( pSort->regReturn ) sqlite3VdbeAddOp1(v, OP_Return, pSort->regReturn);
101823101823
 sqlite3VdbeResolveLabel(v, addrBreak);
101824
- if( eDest==SRT_Output || eDest==SRT_Coroutine ){
101825
- sqlite3VdbeAddOp2(v, OP_Close, pseudoTab, 0);
101826
- }
101827101824
 }
101828101825
101829101826
 /*
101830101827
 ** Return a pointer to a string containing the 'declaration type' of the
101831101828
 ** expression pExpr. The string may be treated as static by the caller.
@@ -110055,11 +110052,10 @@
110055110052
 #define WHERE_ONEROW 0x00001000 /* Selects no more than one row */
110056110053
 #define WHERE_MULTI_OR 0x00002000 /* OR using multiple indices */
110057110054
 #define WHERE_AUTO_INDEX 0x00004000 /* Uses an ephemeral index */
110058110055
 #define WHERE_SKIPSCAN 0x00008000 /* Uses the skip-scan algorithm */
110059110056
 #define WHERE_UNQ_WANTED 0x00010000 /* WHERE_ONEROW would have been helpful*/
110060
-#define WHERE_LIKELIHOOD 0x00020000 /* A likelihood() is affecting nOut */
110061110057
110062110058
 /************** End of whereInt.h ********************************************/
110063110059
 /************** Continuing where we left off in where.c **********************/
110064110060
110065110061
 /*
@@ -114327,20 +114323,18 @@
114327114323
 if( pTerm->truthProb<=0 && iCol>=0 ){
114328114324
 assert( (eOp & WO_IN) || nIn==0 );
114329114325
 testcase( eOp & WO_IN );
114330114326
 pNew->nOut += pTerm->truthProb;
114331114327
 pNew->nOut -= nIn;
114332
- pNew->wsFlags |= WHERE_LIKELIHOOD;
114333114328
 }else{
114334114329
 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
114335114330
 tRowcnt nOut = 0;
114336114331
 if( nInMul==0
114337114332
 && pProbe->nSample
114338114333
 && pNew->u.btree.nEq<=pProbe->nSampleCol
114339114334
 && OptimizationEnabled(db, SQLITE_Stat3)
114340114335
 && ((eOp & WO_IN)==0 || !ExprHasProperty(pTerm->pExpr, EP_xIsSelect))
114341
- && (pNew->wsFlags & WHERE_LIKELIHOOD)==0
114342114336
 ){
114343114337
 Expr *pExpr = pTerm->pExpr;
114344114338
 if( (eOp & (WO_EQ|WO_ISNULL))!=0 ){
114345114339
 testcase( eOp & WO_EQ );
114346114340
 testcase( eOp & WO_ISNULL );
114347114341
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -222,11 +222,11 @@
222 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
223 ** [sqlite_version()] and [sqlite_source_id()].
224 */
225 #define SQLITE_VERSION "3.8.5"
226 #define SQLITE_VERSION_NUMBER 3008005
227 #define SQLITE_SOURCE_ID "2014-06-02 11:26:33 9f18b303cd1bc5779d82669884f802c7889b4947"
228
229 /*
230 ** CAPI3REF: Run-Time Library Version Numbers
231 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
232 **
@@ -101819,13 +101819,10 @@
101819 }else{
101820 sqlite3VdbeAddOp2(v, OP_Next, iTab, addr); VdbeCoverage(v);
101821 }
101822 if( pSort->regReturn ) sqlite3VdbeAddOp1(v, OP_Return, pSort->regReturn);
101823 sqlite3VdbeResolveLabel(v, addrBreak);
101824 if( eDest==SRT_Output || eDest==SRT_Coroutine ){
101825 sqlite3VdbeAddOp2(v, OP_Close, pseudoTab, 0);
101826 }
101827 }
101828
101829 /*
101830 ** Return a pointer to a string containing the 'declaration type' of the
101831 ** expression pExpr. The string may be treated as static by the caller.
@@ -110055,11 +110052,10 @@
110055 #define WHERE_ONEROW 0x00001000 /* Selects no more than one row */
110056 #define WHERE_MULTI_OR 0x00002000 /* OR using multiple indices */
110057 #define WHERE_AUTO_INDEX 0x00004000 /* Uses an ephemeral index */
110058 #define WHERE_SKIPSCAN 0x00008000 /* Uses the skip-scan algorithm */
110059 #define WHERE_UNQ_WANTED 0x00010000 /* WHERE_ONEROW would have been helpful*/
110060 #define WHERE_LIKELIHOOD 0x00020000 /* A likelihood() is affecting nOut */
110061
110062 /************** End of whereInt.h ********************************************/
110063 /************** Continuing where we left off in where.c **********************/
110064
110065 /*
@@ -114327,20 +114323,18 @@
114327 if( pTerm->truthProb<=0 && iCol>=0 ){
114328 assert( (eOp & WO_IN) || nIn==0 );
114329 testcase( eOp & WO_IN );
114330 pNew->nOut += pTerm->truthProb;
114331 pNew->nOut -= nIn;
114332 pNew->wsFlags |= WHERE_LIKELIHOOD;
114333 }else{
114334 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
114335 tRowcnt nOut = 0;
114336 if( nInMul==0
114337 && pProbe->nSample
114338 && pNew->u.btree.nEq<=pProbe->nSampleCol
114339 && OptimizationEnabled(db, SQLITE_Stat3)
114340 && ((eOp & WO_IN)==0 || !ExprHasProperty(pTerm->pExpr, EP_xIsSelect))
114341 && (pNew->wsFlags & WHERE_LIKELIHOOD)==0
114342 ){
114343 Expr *pExpr = pTerm->pExpr;
114344 if( (eOp & (WO_EQ|WO_ISNULL))!=0 ){
114345 testcase( eOp & WO_EQ );
114346 testcase( eOp & WO_ISNULL );
114347
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -222,11 +222,11 @@
222 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
223 ** [sqlite_version()] and [sqlite_source_id()].
224 */
225 #define SQLITE_VERSION "3.8.5"
226 #define SQLITE_VERSION_NUMBER 3008005
227 #define SQLITE_SOURCE_ID "2014-06-03 14:42:34 6d81805298ea882f5fee99504d5a95f1a762a90b"
228
229 /*
230 ** CAPI3REF: Run-Time Library Version Numbers
231 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
232 **
@@ -101819,13 +101819,10 @@
101819 }else{
101820 sqlite3VdbeAddOp2(v, OP_Next, iTab, addr); VdbeCoverage(v);
101821 }
101822 if( pSort->regReturn ) sqlite3VdbeAddOp1(v, OP_Return, pSort->regReturn);
101823 sqlite3VdbeResolveLabel(v, addrBreak);
 
 
 
101824 }
101825
101826 /*
101827 ** Return a pointer to a string containing the 'declaration type' of the
101828 ** expression pExpr. The string may be treated as static by the caller.
@@ -110055,11 +110052,10 @@
110052 #define WHERE_ONEROW 0x00001000 /* Selects no more than one row */
110053 #define WHERE_MULTI_OR 0x00002000 /* OR using multiple indices */
110054 #define WHERE_AUTO_INDEX 0x00004000 /* Uses an ephemeral index */
110055 #define WHERE_SKIPSCAN 0x00008000 /* Uses the skip-scan algorithm */
110056 #define WHERE_UNQ_WANTED 0x00010000 /* WHERE_ONEROW would have been helpful*/
 
110057
110058 /************** End of whereInt.h ********************************************/
110059 /************** Continuing where we left off in where.c **********************/
110060
110061 /*
@@ -114327,20 +114323,18 @@
114323 if( pTerm->truthProb<=0 && iCol>=0 ){
114324 assert( (eOp & WO_IN) || nIn==0 );
114325 testcase( eOp & WO_IN );
114326 pNew->nOut += pTerm->truthProb;
114327 pNew->nOut -= nIn;
 
114328 }else{
114329 #ifdef SQLITE_ENABLE_STAT3_OR_STAT4
114330 tRowcnt nOut = 0;
114331 if( nInMul==0
114332 && pProbe->nSample
114333 && pNew->u.btree.nEq<=pProbe->nSampleCol
114334 && OptimizationEnabled(db, SQLITE_Stat3)
114335 && ((eOp & WO_IN)==0 || !ExprHasProperty(pTerm->pExpr, EP_xIsSelect))
 
114336 ){
114337 Expr *pExpr = pTerm->pExpr;
114338 if( (eOp & (WO_EQ|WO_ISNULL))!=0 ){
114339 testcase( eOp & WO_EQ );
114340 testcase( eOp & WO_ISNULL );
114341
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107107
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108108
 ** [sqlite_version()] and [sqlite_source_id()].
109109
 */
110110
 #define SQLITE_VERSION "3.8.5"
111111
 #define SQLITE_VERSION_NUMBER 3008005
112
-#define SQLITE_SOURCE_ID "2014-06-02 11:26:33 9f18b303cd1bc5779d82669884f802c7889b4947"
112
+#define SQLITE_SOURCE_ID "2014-06-03 14:42:34 6d81805298ea882f5fee99504d5a95f1a762a90b"
113113
114114
 /*
115115
 ** CAPI3REF: Run-Time Library Version Numbers
116116
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117117
 **
118118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.5"
111 #define SQLITE_VERSION_NUMBER 3008005
112 #define SQLITE_SOURCE_ID "2014-06-02 11:26:33 9f18b303cd1bc5779d82669884f802c7889b4947"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -107,11 +107,11 @@
107 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108 ** [sqlite_version()] and [sqlite_source_id()].
109 */
110 #define SQLITE_VERSION "3.8.5"
111 #define SQLITE_VERSION_NUMBER 3008005
112 #define SQLITE_SOURCE_ID "2014-06-03 14:42:34 6d81805298ea882f5fee99504d5a95f1a762a90b"
113
114 /*
115 ** CAPI3REF: Run-Time Library Version Numbers
116 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
117 **
118

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button