]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge with trunk commit [3e646e3f4c].
authordan <dan@noemail.net>
Sat, 17 Apr 2010 15:45:35 +0000 (15:45 +0000)
committerdan <dan@noemail.net>
Sat, 17 Apr 2010 15:45:35 +0000 (15:45 +0000)
FossilOrigin-Name: 43463970f5885fb116588695146f2a56cb22804a

1  2 
manifest
manifest.uuid

diff --cc manifest
index 41f3141c1436e2524bea31ad7b2a667fb51f4d9d,9fe9013723b671cea41dd1888c7697b66d08b7f6..2d93f8ada9447f6e2bfd5253b40fd00660887e94
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C In\ssynchronous=normal\smode,\sdo\snot\ssync\sthe\slog\safter\severy\stransaction.\sIn\ssynchronous=full\smode,\ssync\sthe\slog\sand\sadd\sany\sextra\sframes\srequired\sto\savoid\sblast-radius\srelated\sproblems\safter\seach\stransaction.
- D 2010-04-17T15:42:43
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C Change\ssqlite3_step()\sso\sthat\sit\sautomatically\scalls\ssqlite3_reset()\sinstead\nof\sreturning\sSQLITE_MISUSE\swhen\sinvoked\son\sa\sprepared\sstatement\sthat\npreviously\sreturned\sany\svalue\sother\sthan\sSQLITE_ROW.
 -D 2010-04-17T12:53:20
++C Merge\swith\strunk\scommit\s[3e646e3f4c].
++D 2010-04-17T15:45:35
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -214,10 -215,10 +214,10 @@@ F src/update.c c0dc6b75ad28b76b619042d9
  F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
  F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
  F src/vacuum.c b1d542c8919d4d11119f78069e1906a1ad07e0ee
 -F src/vdbe.c 2abd931ea2aec3eacc6426677f40cc5a1071d34e
 +F src/vdbe.c 2e2aaa765de667dd15e0462cf853efd1b2f97998
  F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
  F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
- F src/vdbeapi.c 74c25680046a116b24b95393914d3669c23305dc
+ F src/vdbeapi.c 11bcc381e81e797fcf3e81fa6a14ec16a04801cc
  F src/vdbeaux.c 3028b2d50df39697e21263685349b5ff1333a29b
  F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
  F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
@@@ -611,9 -611,10 +611,10 @@@ F test/thread004.test f51dfc3936184aaf7
  F test/thread005.test bf5c374ca65dd89fd56c8fe511ccfb46875bda5e
  F test/thread1.test 862dd006d189e8b0946935db17399dcac2f8ef91
  F test/thread2.test 6e0997f7beabb6a7e471bd18740ed04805c785f4
 -F test/thread_common.tcl b65e6b1d1d90dc885e10ad080896c6c56eef0819
 +F test/thread_common.tcl 0b07423d29ddb73d4bacbac69268c8d37b6cc5d2
  F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
  F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
+ F test/tkt-02a8e81d44.test 58494de77be2cf249228ada3f313fa399821c6ab
  F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
  F test/tkt-31338dca7e.test 5741cd48de500347a437ba1be58c8335e83c5a5e
  F test/tkt-3fe897352e.test 10de1a67bd5c66b238a4c96abe55531b37bb4f00
@@@ -804,7 -801,14 +805,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 8549c286497f3d2cd118be1334fce00d6f8a26c4
- R 6ac8dd31103bf297ef819af9a9f02a12
 -P f96782b389b5b97b488dc5814f7082e0393f64cd
 -R b3683c8d5f87dead098717870c446ce4
 -U drh
 -Z 68bc4fd82825f4b7f1278d3f78ee95b8
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFLya9GoxKgR168RlERAvQaAJwLUmtTGSRsZdMt+rOX4V9Acu7enQCdFgG+
 -yMxp/Ep2vaOwFANf9gUAX1Q=
 -=yLEB
 ------END PGP SIGNATURE-----
++P 9bc9b6847303d0324543a9ded8dd0473490122d8 3e646e3f4cd0ca288e444561e951cecfdaee2ab5
++R 9ec1fc417b85c6217c6e7a04071a1912
 +U dan
- Z 35f390be152b1baf460a096be51e37de
++Z 5c9ba544c6cd36a35ee164445a4a1f25
diff --cc manifest.uuid
index d5b1aacc94504870a0ef504889e2736eafb76c89,9d8bb1e648c658c7c93040aae2a8b18cc015380d..d1955142890637fbfcf5292530571bf839f89b48
@@@ -1,1 -1,1 +1,1 @@@
- 9bc9b6847303d0324543a9ded8dd0473490122d8
 -3e646e3f4cd0ca288e444561e951cecfdaee2ab5
++43463970f5885fb116588695146f2a56cb22804a