Merge latest bugfix into wal branch.
FossilOrigin-Name: 265e66e6984c32999bf93981e3b1d19887dfe599
This commit is contained in:
commit
5047af405b
26
manifest
26
manifest
@ -1,8 +1,5 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA1
|
||||
|
||||
C The\sfirst\s6\sWAL\stests\snow\swork.\s\sIt's\sa\sstart.
|
||||
D 2010-04-30T02:13:27
|
||||
C Merge\slatest\sbugfix\sinto\swal\sbranch.
|
||||
D 2010-04-30T06:02:31
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -219,7 +216,7 @@ F src/vdbe.c 21a96eeeb43dedd40072028db0b42e137296a81a
|
||||
F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
|
||||
F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
|
||||
F src/vdbeapi.c 85e448c7d1d6dde7226c721cd8da8f9b5286699d
|
||||
F src/vdbeaux.c be6ca4bb330c7730b358dd627d6d632ca93482c9
|
||||
F src/vdbeaux.c 395d21a1617553ea9b9f4abe0d302449d8549e1d
|
||||
F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
|
||||
F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
|
||||
F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
|
||||
@ -350,7 +347,7 @@ F test/expr.test 9f521ae22f00e074959f72ce2e55d46b9ed23f68
|
||||
F test/filectrl.test 8923a6dc7630f31c8a9dd3d3d740aa0922df7bf8
|
||||
F test/filefmt.test 84e3d0fe9f12d0d2ac852465c6f8450aea0d6f43
|
||||
F test/fkey1.test 01c7de578e11747e720c2d9aeef27f239853c4da
|
||||
F test/fkey2.test 82652daf32ec5a40634a10bc8db571b84d39c7fe
|
||||
F test/fkey2.test d5e065ede294ab52affe2116d54dc85a09301354
|
||||
F test/fkey3.test 42f88d6048d8dc079e2a8cf7baad1cc1483a7620
|
||||
F test/fkey_malloc.test a5ede29bd2f6e56dea78c3d43fb86dd696c068c8
|
||||
F test/format4.test 1f0cac8ff3895e9359ed87e41aaabee982a812eb
|
||||
@ -811,14 +808,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
||||
P 62db5fa3b61be885b2d94e9b9ce3877b2c588350
|
||||
R aef0120cea29fe330250fe68f6819085
|
||||
U drh
|
||||
Z 4fcebc28f74cfe3c8cf3e566a4608163
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.6 (GNU/Linux)
|
||||
|
||||
iD8DBQFL2jzNoxKgR168RlERAgWeAJ95gf+z42nfTDpmaeXk9ZGzWPlbxwCdFTJp
|
||||
+xaXsShNpvEvsgzl2lnGlxE=
|
||||
=76cZ
|
||||
-----END PGP SIGNATURE-----
|
||||
P a92c1851da10acf51e7f6f086b8a23bd731940b3 f660be615a0c1f4641782a83744533f5d3119218
|
||||
R 789557e2ecf4320c154527de09c21ada
|
||||
U dan
|
||||
Z b95a42f00187a9dd3e8e01985f34fa1c
|
||||
|
@ -1 +1 @@
|
||||
a92c1851da10acf51e7f6f086b8a23bd731940b3
|
||||
265e66e6984c32999bf93981e3b1d19887dfe599
|
@ -1449,6 +1449,7 @@ void sqlite3VdbeMakeReady(
|
||||
p->cacheCtr = 1;
|
||||
p->minWriteFileFormat = 255;
|
||||
p->iStatement = 0;
|
||||
p->nFkConstraint = 0;
|
||||
#ifdef VDBE_PROFILE
|
||||
{
|
||||
int i;
|
||||
@ -1651,7 +1652,7 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){
|
||||
** one database file has an open write transaction, a master journal
|
||||
** file is required for an atomic commit.
|
||||
*/
|
||||
for(i=0; i<db->nDb; i++){
|
||||
for(i=0; i<db->nDb; i++){
|
||||
Btree *pBt = db->aDb[i].pBt;
|
||||
if( sqlite3BtreeIsInTrans(pBt) ){
|
||||
needXcommit = 1;
|
||||
|
@ -1598,6 +1598,32 @@ ifcapable auth {
|
||||
unset authargs
|
||||
}
|
||||
|
||||
|
||||
do_test fkey2-19.1 {
|
||||
execsql {
|
||||
CREATE TABLE main(id INTEGER PRIMARY KEY);
|
||||
CREATE TABLE sub(id INT REFERENCES main(id));
|
||||
INSERT INTO main VALUES(1);
|
||||
INSERT INTO main VALUES(2);
|
||||
INSERT INTO sub VALUES(2);
|
||||
}
|
||||
} {}
|
||||
do_test fkey2-19.2 {
|
||||
set S [sqlite3_prepare_v2 db "DELETE FROM main WHERE id = ?" -1 dummy]
|
||||
sqlite3_bind_int $S 1 2
|
||||
sqlite3_step $S
|
||||
} {SQLITE_CONSTRAINT}
|
||||
do_test fkey2-19.3 {
|
||||
sqlite3_reset $S
|
||||
} {SQLITE_CONSTRAINT}
|
||||
do_test fkey2-19.4 {
|
||||
sqlite3_bind_int $S 1 1
|
||||
sqlite3_step $S
|
||||
} {SQLITE_DONE}
|
||||
do_test fkey2-19.4 {
|
||||
sqlite3_finalize $S
|
||||
} {SQLITE_OK}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# The following block of tests, those prefixed with "fkey2-genfkey.", are
|
||||
# the same tests that were used to test the ".genfkey" command provided
|
||||
|
Loading…
x
Reference in New Issue
Block a user