Fossil SCM

Update the built-in SQLite again for a bug fix.

drh 2016-10-12 22:51 trunk
Commit 78fcfd46ad765ac8540e654bc1176080e905c36d
Parent 6ef1500850dbd10…
2 files changed +15 -13 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+15 -13
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -381,11 +381,11 @@
381381
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
382382
 ** [sqlite_version()] and [sqlite_source_id()].
383383
 */
384384
 #define SQLITE_VERSION "3.15.0"
385385
 #define SQLITE_VERSION_NUMBER 3015000
386
-#define SQLITE_SOURCE_ID "2016-10-12 15:15:30 61f0526978af667781c57bcc87510e4524efd0d8"
386
+#define SQLITE_SOURCE_ID "2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3"
387387
388388
 /*
389389
 ** CAPI3REF: Run-Time Library Version Numbers
390390
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
391391
 **
@@ -131903,23 +131903,25 @@
131903131903
 }
131904131904
 }else{
131905131905
 pWInfo->nOBSat = pFrom->isOrdered;
131906131906
 pWInfo->revMask = pFrom->revLoop;
131907131907
 if( pWInfo->nOBSat<=0 ){
131908
- u32 wsFlags = pFrom->aLoop[nLoop-1]->wsFlags;
131909131908
 pWInfo->nOBSat = 0;
131910
- if( nLoop>0 && (wsFlags & WHERE_ONEROW)==0
131911
- && (wsFlags & (WHERE_IPK|WHERE_COLUMN_IN))!=(WHERE_IPK|WHERE_COLUMN_IN)
131912
- ){
131913
- Bitmask m = 0;
131914
- int rc = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pOrderBy, pFrom,
131909
+ if( nLoop>0 ){
131910
+ u32 wsFlags = pFrom->aLoop[nLoop-1]->wsFlags;
131911
+ if( (wsFlags & WHERE_ONEROW)==0
131912
+ && (wsFlags&(WHERE_IPK|WHERE_COLUMN_IN))!=(WHERE_IPK|WHERE_COLUMN_IN)
131913
+ ){
131914
+ Bitmask m = 0;
131915
+ int rc = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pOrderBy, pFrom,
131915131916
 WHERE_ORDERBY_LIMIT, nLoop-1, pFrom->aLoop[nLoop-1], &m);
131916
- testcase( wsFlags & WHERE_IPK );
131917
- testcase( wsFlags & WHERE_COLUMN_IN );
131918
- if( rc==pWInfo->pOrderBy->nExpr ){
131919
- pWInfo->bOrderedInnerLoop = 1;
131920
- pWInfo->revMask = m;
131917
+ testcase( wsFlags & WHERE_IPK );
131918
+ testcase( wsFlags & WHERE_COLUMN_IN );
131919
+ if( rc==pWInfo->pOrderBy->nExpr ){
131920
+ pWInfo->bOrderedInnerLoop = 1;
131921
+ pWInfo->revMask = m;
131922
+ }
131921131923
 }
131922131924
 }
131923131925
 }
131924131926
 }
131925131927
 if( (pWInfo->wctrlFlags & WHERE_SORTBYGROUP)
@@ -195594,11 +195596,11 @@
195594195596
 int nArg, /* Number of args */
195595195597
 sqlite3_value **apUnused /* Function arguments */
195596195598
 ){
195597195599
 assert( nArg==0 );
195598195600
 UNUSED_PARAM2(nArg, apUnused);
195599
- sqlite3_result_text(pCtx, "fts5: 2016-10-10 14:48:36 6624c4964b63e259d5ee006eaa7ec79ddadbd6a6", -1, SQLITE_TRANSIENT);
195601
+ sqlite3_result_text(pCtx, "fts5: 2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3", -1, SQLITE_TRANSIENT);
195600195602
 }
195601195603
195602195604
 static int fts5Init(sqlite3 *db){
195603195605
 static const sqlite3_module fts5Mod = {
195604195606
 /* iVersion */ 2,
195605195607
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -381,11 +381,11 @@
381 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
382 ** [sqlite_version()] and [sqlite_source_id()].
383 */
384 #define SQLITE_VERSION "3.15.0"
385 #define SQLITE_VERSION_NUMBER 3015000
386 #define SQLITE_SOURCE_ID "2016-10-12 15:15:30 61f0526978af667781c57bcc87510e4524efd0d8"
387
388 /*
389 ** CAPI3REF: Run-Time Library Version Numbers
390 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
391 **
@@ -131903,23 +131903,25 @@
131903 }
131904 }else{
131905 pWInfo->nOBSat = pFrom->isOrdered;
131906 pWInfo->revMask = pFrom->revLoop;
131907 if( pWInfo->nOBSat<=0 ){
131908 u32 wsFlags = pFrom->aLoop[nLoop-1]->wsFlags;
131909 pWInfo->nOBSat = 0;
131910 if( nLoop>0 && (wsFlags & WHERE_ONEROW)==0
131911 && (wsFlags & (WHERE_IPK|WHERE_COLUMN_IN))!=(WHERE_IPK|WHERE_COLUMN_IN)
131912 ){
131913 Bitmask m = 0;
131914 int rc = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pOrderBy, pFrom,
 
 
131915 WHERE_ORDERBY_LIMIT, nLoop-1, pFrom->aLoop[nLoop-1], &m);
131916 testcase( wsFlags & WHERE_IPK );
131917 testcase( wsFlags & WHERE_COLUMN_IN );
131918 if( rc==pWInfo->pOrderBy->nExpr ){
131919 pWInfo->bOrderedInnerLoop = 1;
131920 pWInfo->revMask = m;
 
131921 }
131922 }
131923 }
131924 }
131925 if( (pWInfo->wctrlFlags & WHERE_SORTBYGROUP)
@@ -195594,11 +195596,11 @@
195594 int nArg, /* Number of args */
195595 sqlite3_value **apUnused /* Function arguments */
195596 ){
195597 assert( nArg==0 );
195598 UNUSED_PARAM2(nArg, apUnused);
195599 sqlite3_result_text(pCtx, "fts5: 2016-10-10 14:48:36 6624c4964b63e259d5ee006eaa7ec79ddadbd6a6", -1, SQLITE_TRANSIENT);
195600 }
195601
195602 static int fts5Init(sqlite3 *db){
195603 static const sqlite3_module fts5Mod = {
195604 /* iVersion */ 2,
195605
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -381,11 +381,11 @@
381 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
382 ** [sqlite_version()] and [sqlite_source_id()].
383 */
384 #define SQLITE_VERSION "3.15.0"
385 #define SQLITE_VERSION_NUMBER 3015000
386 #define SQLITE_SOURCE_ID "2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3"
387
388 /*
389 ** CAPI3REF: Run-Time Library Version Numbers
390 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
391 **
@@ -131903,23 +131903,25 @@
131903 }
131904 }else{
131905 pWInfo->nOBSat = pFrom->isOrdered;
131906 pWInfo->revMask = pFrom->revLoop;
131907 if( pWInfo->nOBSat<=0 ){
 
131908 pWInfo->nOBSat = 0;
131909 if( nLoop>0 ){
131910 u32 wsFlags = pFrom->aLoop[nLoop-1]->wsFlags;
131911 if( (wsFlags & WHERE_ONEROW)==0
131912 && (wsFlags&(WHERE_IPK|WHERE_COLUMN_IN))!=(WHERE_IPK|WHERE_COLUMN_IN)
131913 ){
131914 Bitmask m = 0;
131915 int rc = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pOrderBy, pFrom,
131916 WHERE_ORDERBY_LIMIT, nLoop-1, pFrom->aLoop[nLoop-1], &m);
131917 testcase( wsFlags & WHERE_IPK );
131918 testcase( wsFlags & WHERE_COLUMN_IN );
131919 if( rc==pWInfo->pOrderBy->nExpr ){
131920 pWInfo->bOrderedInnerLoop = 1;
131921 pWInfo->revMask = m;
131922 }
131923 }
131924 }
131925 }
131926 }
131927 if( (pWInfo->wctrlFlags & WHERE_SORTBYGROUP)
@@ -195594,11 +195596,11 @@
195596 int nArg, /* Number of args */
195597 sqlite3_value **apUnused /* Function arguments */
195598 ){
195599 assert( nArg==0 );
195600 UNUSED_PARAM2(nArg, apUnused);
195601 sqlite3_result_text(pCtx, "fts5: 2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3", -1, SQLITE_TRANSIENT);
195602 }
195603
195604 static int fts5Init(sqlite3 *db){
195605 static const sqlite3_module fts5Mod = {
195606 /* iVersion */ 2,
195607
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,11 +121,11 @@
121121
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122122
 ** [sqlite_version()] and [sqlite_source_id()].
123123
 */
124124
 #define SQLITE_VERSION "3.15.0"
125125
 #define SQLITE_VERSION_NUMBER 3015000
126
-#define SQLITE_SOURCE_ID "2016-10-12 15:15:30 61f0526978af667781c57bcc87510e4524efd0d8"
126
+#define SQLITE_SOURCE_ID "2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3"
127127
128128
 /*
129129
 ** CAPI3REF: Run-Time Library Version Numbers
130130
 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
131131
 **
132132
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,11 +121,11 @@
121 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122 ** [sqlite_version()] and [sqlite_source_id()].
123 */
124 #define SQLITE_VERSION "3.15.0"
125 #define SQLITE_VERSION_NUMBER 3015000
126 #define SQLITE_SOURCE_ID "2016-10-12 15:15:30 61f0526978af667781c57bcc87510e4524efd0d8"
127
128 /*
129 ** CAPI3REF: Run-Time Library Version Numbers
130 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
131 **
132
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -121,11 +121,11 @@
121 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
122 ** [sqlite_version()] and [sqlite_source_id()].
123 */
124 #define SQLITE_VERSION "3.15.0"
125 #define SQLITE_VERSION_NUMBER 3015000
126 #define SQLITE_SOURCE_ID "2016-10-12 18:55:53 443913d582bcd953d85159047541592e2f68ade3"
127
128 /*
129 ** CAPI3REF: Run-Time Library Version Numbers
130 ** KEYWORDS: sqlite3_version, sqlite3_sourceid
131 **
132

Keyboard Shortcuts

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