From: dan <dan@noemail.net>
Date: Sat, 24 Mar 2012 14:45:59 +0000 (+0000)
Subject: Merge auto-incr-merge with incr-merge branch.
X-Git-Tag: mountain-lion~3^2~9^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b8e7546e820bdd4ae4239ce4e2e8066dd2ba61e;p=thirdparty%2Fsqlite.git

Merge auto-incr-merge with incr-merge branch.

FossilOrigin-Name: 1c68687ab6d05b100191663820e7d82377d52445
---

1b8e7546e820bdd4ae4239ce4e2e8066dd2ba61e
diff --cc manifest
index a6dafc26fe,255b73d910..fbaa006611
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sspurious\sSQLITE_CONSTRAINT\serror\sthat\smay\sbe\sreturned\sby\san\sincr-merge\soperation.
- D 2012-03-23T18:26:11.608
 -C Modify\sthe\sway\sthe\snumber\sof\sleaves\swritten\sand\sthe\smaximum\srelative\slevel\sare\scalculated\sin\sthe\sauto-incr-merge\scode.
 -D 2012-03-24T14:45:19.279
++C Merge\sauto-incr-merge\swith\sincr-merge\sbranch.
++D 2012-03-24T14:45:59.366
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -997,7 -997,7 +997,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 1c72cecc6bf5be2a5c04ad6214a6bac22a29f860
- R c0998f3b8bc74543bb7322ba65e1257e
 -P ed69434cd89084f4b57bd2cc4f5cc558904af565
++P ed7c17ea165f6348506bd23ebc58c427bb65d697 0d841c957c6ec4afecb49504177c6279e09d7012
+ R bf494068b52a47b15eebd4119e5e6c0c
  U dan
- Z 3e48c8e93d6fd57a390b8a97532e70ea
 -Z 7eb3af40022cc7568ef4099b19e62140
++Z a37d5b74ba1d4a69b01095005645cefa
diff --cc manifest.uuid
index 0886bc8716,6d50369d05..6bd6c7d918
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ed7c17ea165f6348506bd23ebc58c427bb65d697
 -0d841c957c6ec4afecb49504177c6279e09d7012
++1c68687ab6d05b100191663820e7d82377d52445