mirror of
https://github.com/sqlite/sqlite.git
synced 2025-08-08 14:02:16 +03:00
Merge the latest trunk enhancements into the begin-concurrent-pnu-wal2
branch. FossilOrigin-Name: bcab19d21be42121f1ea3961aedbbe463c60d85d0a3dd8b9593040d217bac3a7
This commit is contained in:
@@ -681,9 +681,9 @@ struct BtCursor {
|
||||
** So, this macro is defined instead.
|
||||
*/
|
||||
#ifdef SQLITE_OMIT_AUTOVACUUM
|
||||
#define ISAUTOVACUUM 0
|
||||
#define ISAUTOVACUUM(pBt) 0
|
||||
#else
|
||||
#define ISAUTOVACUUM (pBt->autoVacuum)
|
||||
#define ISAUTOVACUUM(pBt) (pBt->autoVacuum)
|
||||
#endif
|
||||
|
||||
#ifdef SQLITE_OMIT_CONCURRENT
|
||||
@@ -692,7 +692,7 @@ struct BtCursor {
|
||||
# define ISCONCURRENT (pBt->pMap!=0)
|
||||
#endif
|
||||
|
||||
#define REQUIRE_PTRMAP (ISAUTOVACUUM || ISCONCURRENT)
|
||||
#define REQUIRE_PTRMAP (ISAUTOVACUUM(pBt) || ISCONCURRENT)
|
||||
|
||||
/*
|
||||
** This structure is passed around through all the sanity checking routines
|
||||
|
Reference in New Issue
Block a user