Fossil SCM

Update the built-in SQLite to the second 3.23.0 beta.

drh 2018-03-29 15:42 trunk
Commit 032188a698d937324770389d03e3d98f6416ea3a7029442f788cee6fd78b929d
Parent 6c02983d0a9185f…
2 files changed +23 -30 +1 -1
~ src/sqlite3.c ~ src/sqlite3.h
M src/sqlite3.c
+23 -30
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1147,11 +1147,11 @@
11471147
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
11481148
 ** [sqlite_version()] and [sqlite_source_id()].
11491149
 */
11501150
 #define SQLITE_VERSION "3.23.0"
11511151
 #define SQLITE_VERSION_NUMBER 3023000
1152
-#define SQLITE_SOURCE_ID "2018-03-28 15:56:55 eb29b3369e76ec1df25a5484d8ec5fb924e23d5c70aaa4d794b2b17ee187alt1"
1152
+#define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda"
11531153
11541154
 /*
11551155
 ** CAPI3REF: Run-Time Library Version Numbers
11561156
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
11571157
 **
@@ -21302,14 +21302,15 @@
2130221302
 ** means the commit really has failed and an error should be returned
2130321303
 ** to the user. */
2130421304
 DO_OS_MALLOC_TEST(id);
2130521305
 }
2130621306
 #endif
21307
+ if( id->pMethods==0 ) return SQLITE_NOTFOUND;
2130721308
 return id->pMethods->xFileControl(id, op, pArg);
2130821309
 }
2130921310
 SQLITE_PRIVATE void sqlite3OsFileControlHint(sqlite3_file *id, int op, void *pArg){
21310
- (void)id->pMethods->xFileControl(id, op, pArg);
21311
+ if( id->pMethods ) (void)id->pMethods->xFileControl(id, op, pArg);
2131121312
 }
2131221313
2131321314
 SQLITE_PRIVATE int sqlite3OsSectorSize(sqlite3_file *id){
2131421315
 int (*xSectorSize)(sqlite3_file*) = id->pMethods->xSectorSize;
2131521316
 return (xSectorSize ? xSectorSize(id) : SQLITE_DEFAULT_SECTOR_SIZE);
@@ -51217,11 +51218,11 @@
5121751218
 ** required size. */
5121851219
 assert( pPager->eLock==EXCLUSIVE_LOCK );
5121951220
 rc = pager_truncate(pPager, pPager->dbSize);
5122051221
 }
5122151222
51222
- if( rc==SQLITE_OK && bCommit && isOpen(pPager->fd) ){
51223
+ if( rc==SQLITE_OK && bCommit ){
5122351224
 rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_COMMIT_PHASETWO, 0);
5122451225
 if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
5122551226
 }
5122651227
5122751228
 if( !pPager->exclusiveMode
@@ -52036,13 +52037,11 @@
5203652037
 ** state prior to the start of the transaction, so invoke the
5203752038
 ** SQLITE_FCNTL_DB_UNCHANGED file-control method to disable the
5203852039
 ** assertion that the transaction counter was modified.
5203952040
 */
5204052041
 #ifdef SQLITE_DEBUG
52041
- if( pPager->fd->pMethods ){
52042
- sqlite3OsFileControlHint(pPager->fd,SQLITE_FCNTL_DB_UNCHANGED,0);
52043
- }
52042
+ sqlite3OsFileControlHint(pPager->fd,SQLITE_FCNTL_DB_UNCHANGED,0);
5204452043
 #endif
5204552044
5204652045
 /* If this playback is happening automatically as a result of an IO or
5204752046
 ** malloc error that occurred after the change-counter was updated but
5204852047
 ** before the transaction was committed, then the change-counter
@@ -52796,19 +52795,17 @@
5279652795
 SQLITE_PRIVATE void sqlite3PagerSetBusyHandler(
5279752796
 Pager *pPager, /* Pager object */
5279852797
 int (*xBusyHandler)(void *), /* Pointer to busy-handler function */
5279952798
 void *pBusyHandlerArg /* Argument to pass to xBusyHandler */
5280052799
 ){
52800
+ void **ap;
5280152801
 pPager->xBusyHandler = xBusyHandler;
5280252802
 pPager->pBusyHandlerArg = pBusyHandlerArg;
52803
-
52804
- if( isOpen(pPager->fd) ){
52805
- void **ap = (void **)&pPager->xBusyHandler;
52806
- assert( ((int(*)(void *))(ap[0]))==xBusyHandler );
52807
- assert( ap[1]==pBusyHandlerArg );
52808
- sqlite3OsFileControlHint(pPager->fd, SQLITE_FCNTL_BUSYHANDLER, (void *)ap);
52809
- }
52803
+ ap = (void **)&pPager->xBusyHandler;
52804
+ assert( ((int(*)(void *))(ap[0]))==xBusyHandler );
52805
+ assert( ap[1]==pBusyHandlerArg );
52806
+ sqlite3OsFileControlHint(pPager->fd, SQLITE_FCNTL_BUSYHANDLER, (void *)ap);
5281052807
 }
5281152808
5281252809
 /*
5281352810
 ** Change the page size used by the Pager object. The new page size
5281452811
 ** is passed in *pPageSize.
@@ -55376,16 +55373,13 @@
5537655373
 ** If successful, or if called on a pager for which it is a no-op, this
5537755374
 ** function returns SQLITE_OK. Otherwise, an IO error code is returned.
5537855375
 */
5537955376
 SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager, const char *zMaster){
5538055377
 int rc = SQLITE_OK;
55381
-
55382
- if( isOpen(pPager->fd) ){
55383
- void *pArg = (void*)zMaster;
55384
- rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SYNC, pArg);
55385
- if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
55386
- }
55378
+ void *pArg = (void*)zMaster;
55379
+ rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SYNC, pArg);
55380
+ if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
5538755381
 if( rc==SQLITE_OK && !pPager->noSync ){
5538855382
 assert( !MEMDB );
5538955383
 rc = sqlite3OsSync(pPager->fd, pPager->syncFlags);
5539055384
 }
5539155385
 return rc;
@@ -56063,14 +56057,12 @@
5606356057
 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
5606456058
 /*
5606556059
 ** Reset the lock timeout for pager.
5606656060
 */
5606756061
 SQLITE_PRIVATE void sqlite3PagerResetLockTimeout(Pager *pPager){
56068
- if( isOpen(pPager->fd) ){
56069
- int x = 0;
56070
- sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_LOCK_TIMEOUT, &x);
56071
- }
56062
+ int x = 0;
56063
+ sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_LOCK_TIMEOUT, &x);
5607256064
 }
5607356065
 #endif
5607456066
5607556067
 /*
5607656068
 ** Return the file handle for the journal file (if it exists).
@@ -146489,10 +146481,12 @@
146489146481
 return 0;
146490146482
 }else{
146491146483
 return 1;
146492146484
 }
146493146485
 }
146486
+#else
146487
+ UNUSED_PARAMETER(pFile);
146494146488
 #endif
146495146489
 assert( count>=0 );
146496146490
 if( count < NDELAY ){
146497146491
 delay = delays[count];
146498146492
 prior = totals[count];
@@ -146509,10 +146503,11 @@
146509146503
 #else
146510146504
 /* This case for unix systems that lack usleep() support. Sleeping
146511146505
 ** must be done in increments of whole seconds */
146512146506
 sqlite3 *db = (sqlite3 *)ptr;
146513146507
 int tmout = ((sqlite3 *)ptr)->busyTimeout;
146508
+ UNUSED_PARAMETER(pFile);
146514146509
 if( (count+1)*1000 > tmout ){
146515146510
 return 0;
146516146511
 }
146517146512
 sqlite3OsSleep(db->pVfs, 1000000);
146518146513
 return 1;
@@ -148607,14 +148602,12 @@
148607148602
 *(sqlite3_vfs**)pArg = sqlite3PagerVfs(pPager);
148608148603
 rc = SQLITE_OK;
148609148604
 }else if( op==SQLITE_FCNTL_JOURNAL_POINTER ){
148610148605
 *(sqlite3_file**)pArg = sqlite3PagerJrnlFile(pPager);
148611148606
 rc = SQLITE_OK;
148612
- }else if( fd->pMethods ){
148607
+ }else{
148613148608
 rc = sqlite3OsFileControl(fd, op, pArg);
148614
- }else{
148615
- rc = SQLITE_NOTFOUND;
148616148609
 }
148617148610
 sqlite3BtreeLeave(pBtree);
148618148611
 }
148619148612
 sqlite3_mutex_leave(db->mutex);
148620148613
 return rc;
@@ -179681,11 +179674,11 @@
179681179674
 /* If connected to a ZIPVFS backend, override the page size and
179682179675
 ** offset with actual values obtained from ZIPVFS.
179683179676
 */
179684179677
 fd = sqlite3PagerFile(pPager);
179685179678
 x[0] = pCsr->iPageno;
179686
- if( fd->pMethods!=0 && sqlite3OsFileControl(fd, 230440, &x)==SQLITE_OK ){
179679
+ if( sqlite3OsFileControl(fd, 230440, &x)==SQLITE_OK ){
179687179680
 pCsr->iOffset = x[0];
179688179681
 pCsr->szPage = (int)x[1];
179689179682
 }
179690179683
 }
179691179684
@@ -205564,11 +205557,11 @@
205564205557
 int nArg, /* Number of args */
205565205558
 sqlite3_value **apUnused /* Function arguments */
205566205559
 ){
205567205560
 assert( nArg==0 );
205568205561
 UNUSED_PARAM2(nArg, apUnused);
205569
- sqlite3_result_text(pCtx, "fts5: 2018-03-26 16:37:53 6c40c5574f4ae9795a142d01a8f84afd1b72678ea5f6bfca14a8646c4e862605", -1, SQLITE_TRANSIENT);
205562
+ sqlite3_result_text(pCtx, "fts5: 2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda", -1, SQLITE_TRANSIENT);
205570205563
 }
205571205564
205572205565
 static int fts5Init(sqlite3 *db){
205573205566
 static const sqlite3_module fts5Mod = {
205574205567
 /* iVersion */ 2,
@@ -209834,12 +209827,12 @@
209834209827
 }
209835209828
 #endif /* SQLITE_CORE */
209836209829
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
209837209830
209838209831
 /************** End of stmt.c ************************************************/
209839
-#if __LINE__!=209839
209832
+#if __LINE__!=209832
209840209833
 #undef SQLITE_SOURCE_ID
209841
-#define SQLITE_SOURCE_ID "2018-03-28 15:56:55 eb29b3369e76ec1df25a5484d8ec5fb924e23d5c70aaa4d794b2b17ee187alt2"
209834
+#define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2alt2"
209842209835
 #endif
209843209836
 /* Return the source-id for this library */
209844209837
 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
209845209838
 /************************** End of sqlite3.c ******************************/
209846209839
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1147,11 +1147,11 @@
1147 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1148 ** [sqlite_version()] and [sqlite_source_id()].
1149 */
1150 #define SQLITE_VERSION "3.23.0"
1151 #define SQLITE_VERSION_NUMBER 3023000
1152 #define SQLITE_SOURCE_ID "2018-03-28 15:56:55 eb29b3369e76ec1df25a5484d8ec5fb924e23d5c70aaa4d794b2b17ee187alt1"
1153
1154 /*
1155 ** CAPI3REF: Run-Time Library Version Numbers
1156 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1157 **
@@ -21302,14 +21302,15 @@
21302 ** means the commit really has failed and an error should be returned
21303 ** to the user. */
21304 DO_OS_MALLOC_TEST(id);
21305 }
21306 #endif
 
21307 return id->pMethods->xFileControl(id, op, pArg);
21308 }
21309 SQLITE_PRIVATE void sqlite3OsFileControlHint(sqlite3_file *id, int op, void *pArg){
21310 (void)id->pMethods->xFileControl(id, op, pArg);
21311 }
21312
21313 SQLITE_PRIVATE int sqlite3OsSectorSize(sqlite3_file *id){
21314 int (*xSectorSize)(sqlite3_file*) = id->pMethods->xSectorSize;
21315 return (xSectorSize ? xSectorSize(id) : SQLITE_DEFAULT_SECTOR_SIZE);
@@ -51217,11 +51218,11 @@
51217 ** required size. */
51218 assert( pPager->eLock==EXCLUSIVE_LOCK );
51219 rc = pager_truncate(pPager, pPager->dbSize);
51220 }
51221
51222 if( rc==SQLITE_OK && bCommit && isOpen(pPager->fd) ){
51223 rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_COMMIT_PHASETWO, 0);
51224 if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
51225 }
51226
51227 if( !pPager->exclusiveMode
@@ -52036,13 +52037,11 @@
52036 ** state prior to the start of the transaction, so invoke the
52037 ** SQLITE_FCNTL_DB_UNCHANGED file-control method to disable the
52038 ** assertion that the transaction counter was modified.
52039 */
52040 #ifdef SQLITE_DEBUG
52041 if( pPager->fd->pMethods ){
52042 sqlite3OsFileControlHint(pPager->fd,SQLITE_FCNTL_DB_UNCHANGED,0);
52043 }
52044 #endif
52045
52046 /* If this playback is happening automatically as a result of an IO or
52047 ** malloc error that occurred after the change-counter was updated but
52048 ** before the transaction was committed, then the change-counter
@@ -52796,19 +52795,17 @@
52796 SQLITE_PRIVATE void sqlite3PagerSetBusyHandler(
52797 Pager *pPager, /* Pager object */
52798 int (*xBusyHandler)(void *), /* Pointer to busy-handler function */
52799 void *pBusyHandlerArg /* Argument to pass to xBusyHandler */
52800 ){
 
52801 pPager->xBusyHandler = xBusyHandler;
52802 pPager->pBusyHandlerArg = pBusyHandlerArg;
52803
52804 if( isOpen(pPager->fd) ){
52805 void **ap = (void **)&pPager->xBusyHandler;
52806 assert( ((int(*)(void *))(ap[0]))==xBusyHandler );
52807 assert( ap[1]==pBusyHandlerArg );
52808 sqlite3OsFileControlHint(pPager->fd, SQLITE_FCNTL_BUSYHANDLER, (void *)ap);
52809 }
52810 }
52811
52812 /*
52813 ** Change the page size used by the Pager object. The new page size
52814 ** is passed in *pPageSize.
@@ -55376,16 +55373,13 @@
55376 ** If successful, or if called on a pager for which it is a no-op, this
55377 ** function returns SQLITE_OK. Otherwise, an IO error code is returned.
55378 */
55379 SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager, const char *zMaster){
55380 int rc = SQLITE_OK;
55381
55382 if( isOpen(pPager->fd) ){
55383 void *pArg = (void*)zMaster;
55384 rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SYNC, pArg);
55385 if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
55386 }
55387 if( rc==SQLITE_OK && !pPager->noSync ){
55388 assert( !MEMDB );
55389 rc = sqlite3OsSync(pPager->fd, pPager->syncFlags);
55390 }
55391 return rc;
@@ -56063,14 +56057,12 @@
56063 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
56064 /*
56065 ** Reset the lock timeout for pager.
56066 */
56067 SQLITE_PRIVATE void sqlite3PagerResetLockTimeout(Pager *pPager){
56068 if( isOpen(pPager->fd) ){
56069 int x = 0;
56070 sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_LOCK_TIMEOUT, &x);
56071 }
56072 }
56073 #endif
56074
56075 /*
56076 ** Return the file handle for the journal file (if it exists).
@@ -146489,10 +146481,12 @@
146489 return 0;
146490 }else{
146491 return 1;
146492 }
146493 }
 
 
146494 #endif
146495 assert( count>=0 );
146496 if( count < NDELAY ){
146497 delay = delays[count];
146498 prior = totals[count];
@@ -146509,10 +146503,11 @@
146509 #else
146510 /* This case for unix systems that lack usleep() support. Sleeping
146511 ** must be done in increments of whole seconds */
146512 sqlite3 *db = (sqlite3 *)ptr;
146513 int tmout = ((sqlite3 *)ptr)->busyTimeout;
 
146514 if( (count+1)*1000 > tmout ){
146515 return 0;
146516 }
146517 sqlite3OsSleep(db->pVfs, 1000000);
146518 return 1;
@@ -148607,14 +148602,12 @@
148607 *(sqlite3_vfs**)pArg = sqlite3PagerVfs(pPager);
148608 rc = SQLITE_OK;
148609 }else if( op==SQLITE_FCNTL_JOURNAL_POINTER ){
148610 *(sqlite3_file**)pArg = sqlite3PagerJrnlFile(pPager);
148611 rc = SQLITE_OK;
148612 }else if( fd->pMethods ){
148613 rc = sqlite3OsFileControl(fd, op, pArg);
148614 }else{
148615 rc = SQLITE_NOTFOUND;
148616 }
148617 sqlite3BtreeLeave(pBtree);
148618 }
148619 sqlite3_mutex_leave(db->mutex);
148620 return rc;
@@ -179681,11 +179674,11 @@
179681 /* If connected to a ZIPVFS backend, override the page size and
179682 ** offset with actual values obtained from ZIPVFS.
179683 */
179684 fd = sqlite3PagerFile(pPager);
179685 x[0] = pCsr->iPageno;
179686 if( fd->pMethods!=0 && sqlite3OsFileControl(fd, 230440, &x)==SQLITE_OK ){
179687 pCsr->iOffset = x[0];
179688 pCsr->szPage = (int)x[1];
179689 }
179690 }
179691
@@ -205564,11 +205557,11 @@
205564 int nArg, /* Number of args */
205565 sqlite3_value **apUnused /* Function arguments */
205566 ){
205567 assert( nArg==0 );
205568 UNUSED_PARAM2(nArg, apUnused);
205569 sqlite3_result_text(pCtx, "fts5: 2018-03-26 16:37:53 6c40c5574f4ae9795a142d01a8f84afd1b72678ea5f6bfca14a8646c4e862605", -1, SQLITE_TRANSIENT);
205570 }
205571
205572 static int fts5Init(sqlite3 *db){
205573 static const sqlite3_module fts5Mod = {
205574 /* iVersion */ 2,
@@ -209834,12 +209827,12 @@
209834 }
209835 #endif /* SQLITE_CORE */
209836 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
209837
209838 /************** End of stmt.c ************************************************/
209839 #if __LINE__!=209839
209840 #undef SQLITE_SOURCE_ID
209841 #define SQLITE_SOURCE_ID "2018-03-28 15:56:55 eb29b3369e76ec1df25a5484d8ec5fb924e23d5c70aaa4d794b2b17ee187alt2"
209842 #endif
209843 /* Return the source-id for this library */
209844 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
209845 /************************** End of sqlite3.c ******************************/
209846
--- src/sqlite3.c
+++ src/sqlite3.c
@@ -1147,11 +1147,11 @@
1147 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
1148 ** [sqlite_version()] and [sqlite_source_id()].
1149 */
1150 #define SQLITE_VERSION "3.23.0"
1151 #define SQLITE_VERSION_NUMBER 3023000
1152 #define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda"
1153
1154 /*
1155 ** CAPI3REF: Run-Time Library Version Numbers
1156 ** KEYWORDS: sqlite3_version sqlite3_sourceid
1157 **
@@ -21302,14 +21302,15 @@
21302 ** means the commit really has failed and an error should be returned
21303 ** to the user. */
21304 DO_OS_MALLOC_TEST(id);
21305 }
21306 #endif
21307 if( id->pMethods==0 ) return SQLITE_NOTFOUND;
21308 return id->pMethods->xFileControl(id, op, pArg);
21309 }
21310 SQLITE_PRIVATE void sqlite3OsFileControlHint(sqlite3_file *id, int op, void *pArg){
21311 if( id->pMethods ) (void)id->pMethods->xFileControl(id, op, pArg);
21312 }
21313
21314 SQLITE_PRIVATE int sqlite3OsSectorSize(sqlite3_file *id){
21315 int (*xSectorSize)(sqlite3_file*) = id->pMethods->xSectorSize;
21316 return (xSectorSize ? xSectorSize(id) : SQLITE_DEFAULT_SECTOR_SIZE);
@@ -51217,11 +51218,11 @@
51218 ** required size. */
51219 assert( pPager->eLock==EXCLUSIVE_LOCK );
51220 rc = pager_truncate(pPager, pPager->dbSize);
51221 }
51222
51223 if( rc==SQLITE_OK && bCommit ){
51224 rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_COMMIT_PHASETWO, 0);
51225 if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
51226 }
51227
51228 if( !pPager->exclusiveMode
@@ -52036,13 +52037,11 @@
52037 ** state prior to the start of the transaction, so invoke the
52038 ** SQLITE_FCNTL_DB_UNCHANGED file-control method to disable the
52039 ** assertion that the transaction counter was modified.
52040 */
52041 #ifdef SQLITE_DEBUG
52042 sqlite3OsFileControlHint(pPager->fd,SQLITE_FCNTL_DB_UNCHANGED,0);
 
 
52043 #endif
52044
52045 /* If this playback is happening automatically as a result of an IO or
52046 ** malloc error that occurred after the change-counter was updated but
52047 ** before the transaction was committed, then the change-counter
@@ -52796,19 +52795,17 @@
52795 SQLITE_PRIVATE void sqlite3PagerSetBusyHandler(
52796 Pager *pPager, /* Pager object */
52797 int (*xBusyHandler)(void *), /* Pointer to busy-handler function */
52798 void *pBusyHandlerArg /* Argument to pass to xBusyHandler */
52799 ){
52800 void **ap;
52801 pPager->xBusyHandler = xBusyHandler;
52802 pPager->pBusyHandlerArg = pBusyHandlerArg;
52803 ap = (void **)&pPager->xBusyHandler;
52804 assert( ((int(*)(void *))(ap[0]))==xBusyHandler );
52805 assert( ap[1]==pBusyHandlerArg );
52806 sqlite3OsFileControlHint(pPager->fd, SQLITE_FCNTL_BUSYHANDLER, (void *)ap);
 
 
 
52807 }
52808
52809 /*
52810 ** Change the page size used by the Pager object. The new page size
52811 ** is passed in *pPageSize.
@@ -55376,16 +55373,13 @@
55373 ** If successful, or if called on a pager for which it is a no-op, this
55374 ** function returns SQLITE_OK. Otherwise, an IO error code is returned.
55375 */
55376 SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager, const char *zMaster){
55377 int rc = SQLITE_OK;
55378 void *pArg = (void*)zMaster;
55379 rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SYNC, pArg);
55380 if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
 
 
 
55381 if( rc==SQLITE_OK && !pPager->noSync ){
55382 assert( !MEMDB );
55383 rc = sqlite3OsSync(pPager->fd, pPager->syncFlags);
55384 }
55385 return rc;
@@ -56063,14 +56057,12 @@
56057 #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
56058 /*
56059 ** Reset the lock timeout for pager.
56060 */
56061 SQLITE_PRIVATE void sqlite3PagerResetLockTimeout(Pager *pPager){
56062 int x = 0;
56063 sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_LOCK_TIMEOUT, &x);
 
 
56064 }
56065 #endif
56066
56067 /*
56068 ** Return the file handle for the journal file (if it exists).
@@ -146489,10 +146481,12 @@
146481 return 0;
146482 }else{
146483 return 1;
146484 }
146485 }
146486 #else
146487 UNUSED_PARAMETER(pFile);
146488 #endif
146489 assert( count>=0 );
146490 if( count < NDELAY ){
146491 delay = delays[count];
146492 prior = totals[count];
@@ -146509,10 +146503,11 @@
146503 #else
146504 /* This case for unix systems that lack usleep() support. Sleeping
146505 ** must be done in increments of whole seconds */
146506 sqlite3 *db = (sqlite3 *)ptr;
146507 int tmout = ((sqlite3 *)ptr)->busyTimeout;
146508 UNUSED_PARAMETER(pFile);
146509 if( (count+1)*1000 > tmout ){
146510 return 0;
146511 }
146512 sqlite3OsSleep(db->pVfs, 1000000);
146513 return 1;
@@ -148607,14 +148602,12 @@
148602 *(sqlite3_vfs**)pArg = sqlite3PagerVfs(pPager);
148603 rc = SQLITE_OK;
148604 }else if( op==SQLITE_FCNTL_JOURNAL_POINTER ){
148605 *(sqlite3_file**)pArg = sqlite3PagerJrnlFile(pPager);
148606 rc = SQLITE_OK;
148607 }else{
148608 rc = sqlite3OsFileControl(fd, op, pArg);
 
 
148609 }
148610 sqlite3BtreeLeave(pBtree);
148611 }
148612 sqlite3_mutex_leave(db->mutex);
148613 return rc;
@@ -179681,11 +179674,11 @@
179674 /* If connected to a ZIPVFS backend, override the page size and
179675 ** offset with actual values obtained from ZIPVFS.
179676 */
179677 fd = sqlite3PagerFile(pPager);
179678 x[0] = pCsr->iPageno;
179679 if( sqlite3OsFileControl(fd, 230440, &x)==SQLITE_OK ){
179680 pCsr->iOffset = x[0];
179681 pCsr->szPage = (int)x[1];
179682 }
179683 }
179684
@@ -205564,11 +205557,11 @@
205557 int nArg, /* Number of args */
205558 sqlite3_value **apUnused /* Function arguments */
205559 ){
205560 assert( nArg==0 );
205561 UNUSED_PARAM2(nArg, apUnused);
205562 sqlite3_result_text(pCtx, "fts5: 2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda", -1, SQLITE_TRANSIENT);
205563 }
205564
205565 static int fts5Init(sqlite3 *db){
205566 static const sqlite3_module fts5Mod = {
205567 /* iVersion */ 2,
@@ -209834,12 +209827,12 @@
209827 }
209828 #endif /* SQLITE_CORE */
209829 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */
209830
209831 /************** End of stmt.c ************************************************/
209832 #if __LINE__!=209832
209833 #undef SQLITE_SOURCE_ID
209834 #define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2alt2"
209835 #endif
209836 /* Return the source-id for this library */
209837 SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
209838 /************************** End of sqlite3.c ******************************/
209839
M src/sqlite3.h
+1 -1
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123123
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124124
 ** [sqlite_version()] and [sqlite_source_id()].
125125
 */
126126
 #define SQLITE_VERSION "3.23.0"
127127
 #define SQLITE_VERSION_NUMBER 3023000
128
-#define SQLITE_SOURCE_ID "2018-03-28 15:56:55 eb29b3369e76ec1df25a5484d8ec5fb924e23d5c70aaa4d794b2b17ee187alt1"
128
+#define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda"
129129
130130
 /*
131131
 ** CAPI3REF: Run-Time Library Version Numbers
132132
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133133
 **
134134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.23.0"
127 #define SQLITE_VERSION_NUMBER 3023000
128 #define SQLITE_SOURCE_ID "2018-03-28 15:56:55 eb29b3369e76ec1df25a5484d8ec5fb924e23d5c70aaa4d794b2b17ee187alt1"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134
--- src/sqlite3.h
+++ src/sqlite3.h
@@ -123,11 +123,11 @@
123 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
124 ** [sqlite_version()] and [sqlite_source_id()].
125 */
126 #define SQLITE_VERSION "3.23.0"
127 #define SQLITE_VERSION_NUMBER 3023000
128 #define SQLITE_SOURCE_ID "2018-03-29 13:47:01 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda"
129
130 /*
131 ** CAPI3REF: Run-Time Library Version Numbers
132 ** KEYWORDS: sqlite3_version sqlite3_sourceid
133 **
134

Keyboard Shortcuts

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