/ Check-in [565ff65c]
Login

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

Overview
Comment:Omit the OP_JournalMode opcode from the VDBE when SQLITE_OMIT_PRAGMA is defined.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | mistake
Files: files | file ages | folders
SHA1: 565ff65c61c85c9b2122b31bd9792692aa1e9cda
User & Date: drh 2010-07-02 19:36:52
Context
2010-07-02
19:49
Changes to os_win.c to have it return same error code as os_unix.c. check-in: 33b6f069 user: shaneh tags: mistake
19:36
Omit the OP_JournalMode opcode from the VDBE when SQLITE_OMIT_PRAGMA is defined. check-in: 565ff65c user: drh tags: mistake
19:04
Fix a bug in test_vfs.c causing an assert to fail. Changes to test code only. check-in: 336ce7d2 user: dan tags: mistake
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbe.c.

  5151   5151   */
  5152   5152   case OP_Checkpoint: {
  5153   5153     rc = sqlite3Checkpoint(db, pOp->p1);
  5154   5154     break;
  5155   5155   };  
  5156   5156   #endif
  5157   5157   
         5158  +#ifndef SQLITE_OMIT_PRAGMA
  5158   5159   /* Opcode: JournalMode P1 P2 P3 * P5
  5159   5160   **
  5160   5161   ** Change the journal mode of database P1 to P3. P3 must be one of the
  5161   5162   ** PAGER_JOURNALMODE_XXX values. If changing between the various rollback
  5162   5163   ** modes (delete, truncate, persist, off and memory), this is a simple
  5163   5164   ** operation. No IO is required.
  5164   5165   **
................................................................................
  5275   5276     pOut = &aMem[pOp->p2];
  5276   5277     pOut->flags = MEM_Str|MEM_Static|MEM_Term;
  5277   5278     pOut->z = (char *)sqlite3JournalModename(eNew);
  5278   5279     pOut->n = sqlite3Strlen30(pOut->z);
  5279   5280     pOut->enc = SQLITE_UTF8;
  5280   5281     sqlite3VdbeChangeEncoding(pOut, encoding);
  5281   5282     break;
  5282         -};  
         5283  +};
         5284  +#endif /* SQLITE_OMIT_PRAGMA */
  5283   5285   
  5284   5286   #if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
  5285   5287   /* Opcode: Vacuum * * * * *
  5286   5288   **
  5287   5289   ** Vacuum the entire database.  This opcode will cause other virtual
  5288   5290   ** machines to be created and run.  It may not be called from within
  5289   5291   ** a transaction.