Merge the latest changes on trunk (and especially the fix for

the (xANDy)OR(z) bug) into apple-osx.

FossilOrigin-Name: 5754a3a56144ee0e073c80651bf11cb23ee7f447

diff --cc manifest
index 2ec90ed444c4ef41d2b9b159e8940d57947cd6bc,3a17aa593b450882f0c7e695e7373b64a697ea76..5234a7a75ccb379784aa1b9152525220ecef23fa
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
  -----BEGIN PGP SIGNED MESSAGE-----
  Hash: SHA1
  
- C Merge\sall\schanges\sassociated\swith\sthe\sversion\s3.6.21\srelease\sinto\sthe\sOS-X\nbranch.
- D 2009-12-07T23:53:52
 -C Remove\sunreachable\scode\sthat\swas\sadded\sby\sthe\sfix\sto\sthe\s"(xANDy)OR(z)"\sbug\nin\sthe\sprevious\scheck-in.
 -D 2009-12-16T23:43:55
++C Merge\sthe\slatest\schanges\son\strunk\s(and\sespecially\sthe\sfix\sfor\nthe\s(xANDy)OR(z)\sbug)\sinto\sapple-osx.
++D 2009-12-16T23:46:12
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 -F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 +F Makefile.in df768f5addf7b6da984aa279123d2671d716cf5c
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
  F Makefile.vxworks 10010ddbf52e2503c7c49c7c0b7c7a096f8638a6
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -89,12 -89,9 +89,12 @@@ F ext/rtree/rtree_perf.tcl 6c18c1f23cd4
  F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
  F ext/rtree/tkt3363.test 2bf324f7908084a5f463de3109db9c6e607feb1b
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk a92b99b264c3b277f8cf74d50aadc22c55967ef0
+ F main.mk 93d7ab227d0110d996d0db430a9a27d42980c7be
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -125,20 -122,20 +125,20 @@@ F src/delete.c 8b8afb9cd7783d573eae55a3
  F src/expr.c 50385ed51f1cd7f1ab289629cd0f87d5b2fcca52
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e2116672a6bd610dc888e27df292ebc7999c9bb0
- F src/func.c 44bab6e35e2a1128f1b75fa54220d5bd99acb784
 -F src/func.c 69906340991919b4933dd8630774ad069e4d582e
++F src/func.c 7b3a20690be32067365272b25b503302f23b889b
  F src/global.c 75946a4a2ab41c6ae58f10ca0ed31b3449694b26
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c f9c6098988675ac258b2f98ea5f7e370fc9990fa
  F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c
 -F src/legacy.c 9304428e71b1d622b764913e1432e69156814755
 +F src/legacy.c 3c3f78cbe4ada0b17b208da1e2e2773d6a96f27d
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581
- F src/main.c ab13ef864a854d94e0a66566be43e3ad013ac468
 -F src/main.c b47cc67a81937d24e3ca14beffe0cbcc8dfda896
++F src/main.c f195bd6fc719bda15c0efb504ca9e250411730de
  F src/malloc.c 5fa175797f982b178eaf38afba9c588a866be729
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 552f7e11486272f27948d2de9c012884d1f52908
 +F src/mem1.c 34cb5c25e4d2c1dcbdce244745999babf8d8dc5c
  F src/mem2.c 3f196f6fd3f4320035eb4acbe4530686da2f14b1
  F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
  F src/mem5.c 4837b795ebdecc0cfe1522cd0c8b2c5d84ea490d
@@@ -168,11 -165,11 +168,11 @@@ F src/printf.c 644bc7d59df3dc56d6d8b9a5
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c d052e5c44bab34f83b3c1741aaa07478d18b5dd5
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 2f9ed7482e7a25b0b127fc41693bbdbe1caf5647
+ F src/select.c 68c58dc49341472e4e5661a47a1a9e5f8a161340
  F src/shell.c f4948cb6d30665d755a6b5e0ec313d1094aab828
- F src/sqlite.h.in d4bb934f1e2b77924096f4913efc2139bc9851fc
 -F src/sqlite.h.in 176e993dce3c9cfe5610aca0ef99f4dfd70896bb
++F src/sqlite.h.in 40b3091292e5830b33c9e50d8c52805b13c1e923
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
- F src/sqliteInt.h e946a6a3f2df015cdbc7668e9626987e8badbb5f
+ F src/sqliteInt.h 93d5d01d9ea57b95ba709733dce830ec056deb84
  F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
  F src/status.c e651be6b30d397d86384c6867bc016e4913bcac7
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -218,8 -215,8 +218,8 @@@ F src/vacuum.c 03309a08d549f9389cc3a358
  F src/vdbe.c 5ed06318aac5d57849170a8bf39e807c22c5fedd
  F src/vdbe.h bea1f0cd530775bdb58a340265f3cf3ee920e9b2
  F src/vdbeInt.h d7ea821ac7813c9bea0fe87558c35e07b2c7c44d
- F src/vdbeapi.c 52739f95b7f6a5ba013638673cf77e0c59dc0eca
- F src/vdbeaux.c 0981dcb5b933b74ae7bc9bfa7770df5e4da849b3
 -F src/vdbeapi.c fc3787eb2f5487d4cc3444de42d56f2e39d311f5
++F src/vdbeapi.c 2d8304acf89303a070a158937c13b9697a6721ab
+ F src/vdbeaux.c 42ed644fea54c3fbfa70af7c65456ec4ab089c77
  F src/vdbeblob.c 84f924700a7a889152aeebef77ca5f4e3875ffb4
  F src/vdbemem.c 1e16e3a16e55f4c3452834f0e041726021aa66e0
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
@@@ -242,7 -239,7 +242,7 @@@ F test/async2.test bf5e2ca2c96763b4cba3
  F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
  F test/async4.test aafa6328c559d3e4bb587de770cbdecfca06f0da
  F test/async5.test f3592d79c84d6e83a5f50d3fd500445f7d97dfdf
- F test/attach.test ebbaeb5032fb7a0a3eb8b5a4b41656da8b35e661
 -F test/attach.test ce9660e51768fab93cf129787be886c5d6c4fd81
++F test/attach.test ccdedd5496a0244f8e45366ba9253af30083ea84
  F test/attach2.test a295d2d7061adcee5884ef4a93c7c96a82765437
  F test/attach3.test bd9830bc3a0d22ed1310c9bff6896927937017dc
  F test/attachmalloc.test cf8cf17d183de357b1147a9baacbdfc85b940b61
@@@ -783,14 -783,14 +787,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 62f15c0aeaec5d778addb6edba62411c698bec0f 1ed88e9d01e9eda5cbc622e7614277f29bcc551c
- R cf1909366cf2795f7cddf4999bd047be
 -P 2c2de252666662f5459904fc33a9f2956cbff23c
 -R 788e421365d0e76ba399b58405f069c0
++P ad08794d7239bb804eb39c00170821732b60cb65 04915562a0c2cb377bc7baa0c06c5d9ac376563c
++R d023a6c65c47e42ad7fb99357a2e6785
  U drh
- Z af56e8a859d9915d17c32b5351556778
 -Z ec1d76d017fc8850fea3e2efadea4e03
++Z 0eacb22f164afbc3b89f4f76f202d6d0
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1.4.6 (GNU/Linux)
  
- iD8DBQFLHZWUoxKgR168RlERAgy2AJ94edIz+IyLZu6fvBeDJoxlOOqJjACghqTo
- MgOO8nXoLVYOCyukTpPgmZo=
- =X5W4
 -iD8DBQFLKXC+oxKgR168RlERArULAJ9EXPN/43YX+xLi4kYmaBI16MocVQCfd57b
 -3yY4D6DwpXWJCHus3nTzzCU=
 -=FeSr
++iD8DBQFLKXFIoxKgR168RlERAlsqAJ96R9ALS/cmuJr8UEoq6zYOOlYbfQCeOl8e
++j+eTy/OkuWViInsisc5DLeU=
++=W0CZ
  -----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 2db0dfbec48a51b8de2700a348f0cd65e110a248,8a33e8224272eebce8fda05abddaea00faea417d..840dfc9a1ba75dd89ba0b0a0e93b0a1c9eb40ac4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ad08794d7239bb804eb39c00170821732b60cb65
 -04915562a0c2cb377bc7baa0c06c5d9ac376563c
++5754a3a56144ee0e073c80651bf11cb23ee7f447

diff --cc src/func.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
index f5354d04a8bbf89b5384f864bb77222b8a863774,50c59e2ee3b13a492a5bfe1d97533b3da5c83128..ec17741da17a0237a7bb545b74d86d4177674704
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -1531,10 -1560,7 +1561,7 @@@ int sqlite3_complete16(const void *sql)
  ** The busy callback should not take any actions which modify the
  ** database connection that invoked the busy handler.  Any such actions
  ** result in undefined behavior.
--** 
- ** Requirements:
- ** [H12311] [H12312] [H12314] [H12316] [H12318]
 +**
  ** A busy handler must not close the database connection
  ** or [prepared statement] that invoked the busy handler.
  */

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/attach.test
Simple merge