Omit the OP_JournalMode opcode from the VDBE when SQLITE_OMIT_PRAGMA is

defined.

FossilOrigin-Name: 565ff65c61c85c9b2122b31bd9792692aa1e9cda
This commit is contained in:
drh
2010-07-02 19:36:52 +00:00
parent 5257af7dba
commit cac29a67e9
3 changed files with 21 additions and 9 deletions
+17 -7
View File
@@ -1,5 +1,8 @@
C Fix\sa\sbug\sin\stest_vfs.c\scausing\san\sassert\sto\sfail.\sChanges\sto\stest\scode\sonly.
D 2010-07-02T19:04:59
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
C Omit\sthe\sOP_JournalMode\sopcode\sfrom\sthe\sVDBE\swhen\sSQLITE_OMIT_PRAGMA\sis\ndefined.
D 2010-07-02T19:36:52
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -217,7 +220,7 @@ F src/update.c 19c899c23cd29fd102c9068e0b0ff5b087204beb
F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
F src/vacuum.c 241a8386727c1497eba4955933356dfba6ff8c9f
F src/vdbe.c 8b3bae957a874891361e4b5ada373e6f49e18630
F src/vdbe.c 3a241b2148e91959df7232f6b5405fbb95a4d2c4
F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
F src/vdbeapi.c dc3138f10afbc95ed3c21dd25abb154504b1db9d
@@ -830,7 +833,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 0d7fd6fe9deeddbec8dff1393beed126ae44c0ee
R b39cd06fbf137c8f12d334c514034846
U dan
Z bf1fb8ff8a6d2977f4a54ef75249d7c6
P 336ce7d29767f76c4a92aa4bbc46d21e19871667
R 217ab76abbb703b993ec9ef38809fa6c
U drh
Z a8fb4caae1487543fc1d1643b8a41cad
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMLj/XoxKgR168RlERAk8+AJ41mSJneLVxQjYgDYTWKWWgv78ArgCfZ5F9
aiYNrBp4wk+L4UAUxFtyf7Q=
=S74b
-----END PGP SIGNATURE-----
+1 -1
View File
@@ -1 +1 @@
336ce7d29767f76c4a92aa4bbc46d21e19871667
565ff65c61c85c9b2122b31bd9792692aa1e9cda
+3 -1
View File
@@ -5155,6 +5155,7 @@ case OP_Checkpoint: {
};
#endif
#ifndef SQLITE_OMIT_PRAGMA
/* Opcode: JournalMode P1 P2 P3 * P5
**
** Change the journal mode of database P1 to P3. P3 must be one of the
@@ -5279,7 +5280,8 @@ case OP_JournalMode: { /* out2-prerelease */
pOut->enc = SQLITE_UTF8;
sqlite3VdbeChangeEncoding(pOut, encoding);
break;
};
};
#endif /* SQLITE_OMIT_PRAGMA */
#if !defined(SQLITE_OMIT_VACUUM) && !defined(SQLITE_OMIT_ATTACH)
/* Opcode: Vacuum * * * * *