From: drh <drh@noemail.net>
Date: Mon, 13 Feb 2012 21:24:03 +0000 (+0000)
Subject: Merge the non-blocking ROLLBACK changes into trunk.
X-Git-Tag: version-3.7.11~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99b18401abfdefe3df88350fc040f646d061ed03;p=thirdparty%2Fsqlite.git

Merge the non-blocking ROLLBACK changes into trunk.

FossilOrigin-Name: 9c572d424a20b0585bfac358a5d1ee5276dd05ba
---

99b18401abfdefe3df88350fc040f646d061ed03
diff --cc manifest
index 9583d49b64,24d2878880..e43e6ab96e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sharmless\scompiler\swarning\sintroduced\sby\sthe\sprevious\scheck-in.
- D 2012-02-13T20:28:15.804
 -C Add\sthe\snew\sSQLITE_ABORT_ROLLBACK\sextended\serror\scode\sto\sbe\sreturned\sfor\nstatements\sthat\sare\scancelled\sdue\sto\sa\srollback.
 -D 2012-02-13T17:01:51.864
++C Merge\sthe\snon-blocking\sROLLBACK\schanges\sinto\strunk.
++D 2012-02-13T21:24:03.262
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -989,7 -989,7 +989,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 84b324606adc8437338c086404eb157f30f04130
- R d3286eff693659b9b4732d3698634dbe
 -P 9b66c79e054c8a109d1ee8d35fed1c42814c330d
 -R 1066e7f5b671895741b8f4418594178f
++P a8a042a751557d06bf04455ed7629cb29adcd87f 549f4fd00d8325c10099b100e5202b77ee1d83ad
++R f5be37b531ffc02ec5dfb73b01bae4f2
  U drh
- Z ade107925d4b7260ea92f951a93b4e84
 -Z 81fc65771654ca843df55065930e81f0
++Z a17a96e51ae999984897d31a6e51ca34
diff --cc manifest.uuid
index 0fa6079cc8,67d01dda7d..28f74b0a56
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a8a042a751557d06bf04455ed7629cb29adcd87f
 -549f4fd00d8325c10099b100e5202b77ee1d83ad
++9c572d424a20b0585bfac358a5d1ee5276dd05ba