SQLite: Check-in [fabcb6b9]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Fix the build so that it once again works with SQLITE_OMIT_SHARED_CACHE and SQLITE_OMIT_AUTOVACUUM.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	fabcb6b95e1d4059d1e6c6183f65846f6cbd5749
User & Date:	drh 2010-12-06 21:09:59

Context

2010-12-07
07:57		Add tests to tkt-80ba201079.test. check-in: c370338c user: dan tags: trunk
2010-12-06
21:09		Fix the build so that it once again works with SQLITE_OMIT_SHARED_CACHE and SQLITE_OMIT_AUTOVACUUM. check-in: fabcb6b9 user: drh tags: trunk
21:06		Add the ability to disable constant factoring using sqlite3_test_control(). Add a TCL interface to this new capability and add tests cases to the TCL test scripts to actually use the new capability. check-in: ad8bc681 user: drh tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/btree.c.

  1707   1707     u8 nReserve;                   /* Byte of unused space on each page */
  1708   1708     unsigned char zDbHeader[100];  /* Database header content */
  1709   1709   
  1710   1710     /* True if opening an ephemeral, temporary database */
  1711   1711     const int isTempDb = zFilename==0 || zFilename[0]==0;
  1712   1712   
  1713   1713     /* Set the variable isMemdb to true for an in-memory database, or 
  1714         -  ** false for a file-based database. This symbol is only required if
  1715         -  ** either of the shared-data or autovacuum features are compiled 
  1716         -  ** into the library.
         1714  +  ** false for a file-based database.
  1717   1715     */
  1718         -#if !defined(SQLITE_OMIT_SHARED_CACHE) || !defined(SQLITE_OMIT_AUTOVACUUM)
  1719         -  #ifdef SQLITE_OMIT_MEMORYDB
  1720         -    const int isMemdb = 0;
  1721         -  #else
  1722         -    const int isMemdb = (zFilename && strcmp(zFilename, ":memory:")==0)
  1723         -                         || (isTempDb && sqlite3TempInMemory(db));
  1724         -  #endif
         1716  +#ifdef SQLITE_OMIT_MEMORYDB
         1717  +  const int isMemdb = 0;
         1718  +#else
         1719  +  const int isMemdb = (zFilename && strcmp(zFilename, ":memory:")==0)
         1720  +                       || (isTempDb && sqlite3TempInMemory(db));
  1725   1721   #endif
  1726   1722   
  1727   1723     assert( db!=0 );
  1728   1724     assert( sqlite3_mutex_held(db->mutex) );
  1729   1725     assert( (flags&0xff)==flags );   /* flags fit in 8 bits */
  1730   1726   
  1731   1727     /* Only a BTREE_SINGLE database can be BTREE_UNORDERED */