mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the build so that it works for SQLITE_OMIT_WAL again. 

FossilOrigin-Name: d55a557bc70460c46a67ae5acd9f8a8356a580c2
This commit is contained in:
drh 2016-01-14 01:56:43 +00:00
parent 13c808a9fc
commit b4acd6a8d6
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Look\sfor\spthread_mutexattr_init()\sinstead\sof\spthread_create()\sin\sautoconf\nscripts,\sto\swork\saround\sissues\swith\sASAN.
D 2016-01-13T21:23:48.485
C Fix\sthe\sbuild\sso\sthat\sit\sworks\sfor\sSQLITE_OMIT_WAL\sagain.
D 2016-01-14T01:56:43.015
F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
@ -325,7 +325,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
F src/os_unix.c b509b49b40a269e7b75ab511b6e92b2dc9444359
F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
F src/pager.c 5dda328a9a5e9405b6971d62d0d5e3ea85c6195a
F src/pager.c f4e9ac39fbb1e0fde97af85c0f4e00eb90764b67
F src/pager.h 1c2a49143dfba9e69cc8159ef019f472ed8d260b
F src/parse.y caad1e98edeca6960493d0c60d31b76820dd7776
F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
@ -1412,7 +1412,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 14d296fa7b43b4999a1fd070cf030f83fe1b94c3
R 2b677537f1e9b18e2947e5670c77e061
P 9c3a0dc2e8bf202cd846841bd5d4ea67aa189c1a
R 7d3ddebf3af55be615ba3903145bc66f
U drh
Z d3d675fa0c765d73d93e44db2a68c69e
Z 40f341244fdfbe64f691992440e887ec

2
manifest.uuid
View File

@ -1 +1 @@
9c3a0dc2e8bf202cd846841bd5d4ea67aa189c1a
d55a557bc70460c46a67ae5acd9f8a8356a580c2

6
src/pager.c
View File

@ -5627,7 +5627,7 @@ int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){
if( rc!=SQLITE_OK ){
return rc;
}
sqlite3WalExclusiveMode(pPager->pWal, 1);
(void)sqlite3WalExclusiveMode(pPager->pWal, 1);
}
/* Grab the write lock on the log file. If successful, upgrade to
@ -6697,7 +6697,11 @@ sqlite3_file *sqlite3PagerFile(Pager *pPager){
** This will be either the rollback journal or the WAL file.
*/
sqlite3_file *sqlite3PagerJrnlFile(Pager *pPager){
#if SQLITE_OMIT_WAL
return pPager->jfd;
#else
return pPager->pWal ? sqlite3WalFile(pPager->pWal) : pPager->jfd;
#endif
}
/*