/ Check-in [03f7d36a]
Login

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

Overview
Comment:Changes to work with SQLITE_OMIT_VIRTUAL_TABLE.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 03f7d36a8a24825b7542b5fed651af1622ae4eb5
User & Date: drh 2011-05-26 14:19:14
References
2011-05-28
19:24
Fix a "#ifdef" from check-in [03f7d36a8a] that should have been "#ifndef". check-in: edb865c3 user: drh tags: trunk
Context
2011-05-28
15:53
Print a log message on each cache spill if compiled with SQLITE_LOG_CACHE_SPILL. check-in: 5f15579f user: drh tags: trunk
2011-05-26
14:19
Changes to work with SQLITE_OMIT_VIRTUAL_TABLE. check-in: 03f7d36a user: drh tags: trunk
2011-05-25
23:18
Fix some minor and harmless compiler warnings. check-in: a4755e70 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbe.c.

  2580   2580         */
  2581   2581         sqlite3SetString(&p->zErrMsg, db, "cannot open savepoint - "
  2582   2582           "SQL statements in progress");
  2583   2583         rc = SQLITE_BUSY;
  2584   2584       }else{
  2585   2585         nName = sqlite3Strlen30(zName);
  2586   2586   
         2587  +#ifdef SQLITE_OMIT_VIRTUAL_TABLE
  2587   2588         /* This call is Ok even if this savepoint is actually a transaction
  2588   2589         ** savepoint (and therefore should not prompt xSavepoint()) callbacks.
  2589   2590         ** If this is a transaction savepoint being opened, it is guaranteed
  2590   2591         ** that the db->aVTrans[] array is empty.  */
  2591   2592         assert( db->autoCommit==0 || db->nVTrans==0 );
  2592   2593         rc = sqlite3VtabSavepoint(db, SAVEPOINT_BEGIN,
  2593   2594                                   db->nStatement+db->nSavepoint);
  2594   2595         if( rc!=SQLITE_OK ) goto abort_due_to_error;
         2596  +#endif
  2595   2597   
  2596   2598         /* Create a new savepoint structure. */
  2597   2599         pNew = sqlite3DbMallocRaw(db, sizeof(Savepoint)+nName+1);
  2598   2600         if( pNew ){
  2599   2601           pNew->zName = (char *)&pNew[1];
  2600   2602           memcpy(pNew->zName, zName, nName+1);
  2601   2603       

Changes to test/tkt-2d1a5c67d.test.

    15     15   # 
    16     16   #
    17     17   
    18     18   set testdir [file dirname $argv0]
    19     19   source $testdir/tester.tcl
    20     20   set testprefix tkt-2d1a5c67d
    21     21   
    22         -ifcapable !wal {finish_test; return}
           22  +ifcapable {!wal || !vtab} {finish_test; return}
    23     23   
    24     24   for {set ii 1} {$ii<=10} {incr ii} {
    25     25     do_test tkt-2d1a5c67d.1.$ii {
    26     26       db close
    27     27       forcedelete test.db test.db-wal
    28     28       sqlite3 db test.db
    29     29       db eval "PRAGMA cache_size=$::ii"