From: dan <dan@noemail.net>
Date: Sat, 24 Apr 2010 14:33:08 +0000 (+0000)
Subject: Merge with [0291ed974d].
X-Git-Tag: version-3.7.2~455^2~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9de7943783c0100d606fd082effcbb34044fe6b5;p=thirdparty%2Fsqlite.git

Merge with [0291ed974d].
Merge with [0291ed974d].
Merge with [0291ed974d].

FossilOrigin-Name: a352f6285e33a806fbe4475e720e763fdc5bb47d
---

9de7943783c0100d606fd082effcbb34044fe6b5
diff --cc manifest
index 75fb38c6d7,2c22758bdf..e0cccadbc3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,8 +1,5 @@@
- C Merge\swith\s[e79dac3c2f].
- D 2010-04-24T04:53:16
 ------BEGIN PGP SIGNED MESSAGE-----
 -Hash: SHA1
 -
 -C When\scommands\ssuch\sas\sALTER\sTABLE\sand\sVACUUM\suse\sSQL\sinternally,\smake\ssure\nthey\suse\sonly\sthe\sbuilt-in\sfunctions\sand\snot\sapplication-defined\soverrides\nfor\sthose\sfunctions.
 -D 2010-04-24T14:02:59
++C Merge\swith\s[0291ed974d].\nMerge\swith\s[0291ed974d].\nMerge\swith\s[0291ed974d].
++D 2010-04-24T14:33:08
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -109,11 -112,11 +109,11 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c e86634da8c48357a759694c9c7c471125cd8d5a8
  F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0
  F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
 -F src/btree.c 01559397cbd4a5aa62a822e8ca9ac94b6db14743
 -F src/btree.h ad6cff92286f9b02ec32f0b97136e9a544249f37
 -F src/btreeInt.h 22447d259639271774a931cbf66aa55112846681
 +F src/btree.c f87ed73ef82bccb1e5dd63d6a4919272d3354c8a
 +F src/btree.h dd83041eda10c17daf023257c1fc883b5f71f85a
 +F src/btreeInt.h b0c87f6725b06a0aa194a6d25d54b16ce9d6e291
  F src/build.c 11100b66fb97638d2d874c1d34d8db90650bb1d7
- F src/callback.c 908f3e0172c3d4058f4ca0acd42c637c52e9669f
+ F src/callback.c 01843bdf4b0420fd28046525d150fcd9802931a9
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 51553a859994d01d8bf3500747f66a890c459774
  F src/date.c 485a4409a384310e6d93fd1104a9d0a8658becd9
@@@ -168,9 -169,9 +168,9 @@@ F src/resolve.c ac5f1a713cd1ae77f08b83c
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c b7c9a40bc1567bceff52ad4b73108734ee4bf268
  F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4
 -F src/sqlite.h.in dc98616304e3e776008655671d81e3ad3028ada7
 +F src/sqlite.h.in b9b0365613d4a99a0e6bc0ae6dbc73cc4a7e7cb7
  F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
- F src/sqliteInt.h 8da48f67766bafb916b551482c51d8aad1be2331
 -F src/sqliteInt.h 15339730eeeb571ed515d125e3446ae80ec3b4ef
++F src/sqliteInt.h de668d16e73ef456b940ab3f60b2ac8842957853
  F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
  F src/status.c 4df6fe7dce2d256130b905847c6c60055882bdbe
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -213,12 -214,12 +213,12 @@@ F src/trigger.c 8927588cb9e6d47f933b53b
  F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208
  F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
  F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
- F src/vacuum.c b1d542c8919d4d11119f78069e1906a1ad07e0ee
+ F src/vacuum.c 8e7d9a6fd076774bb6e211cad335c7337948a164
 -F src/vdbe.c 2abd931ea2aec3eacc6426677f40cc5a1071d34e
 +F src/vdbe.c 09e88e8b01b413271b5ccd8c902c424cd563e342
  F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
  F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
 -F src/vdbeapi.c 11bcc381e81e797fcf3e81fa6a14ec16a04801cc
 -F src/vdbeaux.c 3028b2d50df39697e21263685349b5ff1333a29b
 +F src/vdbeapi.c 466044df5bc916f778833e927165fd02cdef6086
 +F src/vdbeaux.c be6ca4bb330c7730b358dd627d6d632ca93482c9
  F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
  F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
@@@ -808,7 -801,14 +808,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P a031aa1fa01f062b087154833738f011f7bc4eb5 e79dac3c2f723ed7cc62fcef468f53952711f242
- R 39ee25bf2853e2a576b8db264ae5f0b2
 -P e79dac3c2f723ed7cc62fcef468f53952711f242
 -R f7b3f2f2586b016425d2ff4d0aa6d5e4
 -U drh
 -Z 60e8a7849ac5e43c2a7c878285e8be5d
 ------BEGIN PGP SIGNATURE-----
 -Version: GnuPG v1.4.6 (GNU/Linux)
 -
 -iD8DBQFL0voooxKgR168RlERAuygAJ9JZEPkPJWwA9gu3SJJpCJ6uLWSCACfXJK2
 -t7ZFFTqEHyFHDlhkRqjBdIY=
 -=45i3
 ------END PGP SIGNATURE-----
++P 1e793d3a6d46ec5d744e077b10362e7cfa118eef 0291ed974d5bf1e344e2c38422530cc961b897da
++R 2a96ead5dd8a150336ca23e8e3a9aa5f
 +U dan
- Z 61f7a505aff9cfe44f8682955cde1b74
++Z 95ff3026ac52c375d39478f793178d69
diff --cc manifest.uuid
index f06a533fb4,d37c175bb5..9d7f64dc51
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1e793d3a6d46ec5d744e077b10362e7cfa118eef
 -0291ed974d5bf1e344e2c38422530cc961b897da
++a352f6285e33a806fbe4475e720e763fdc5bb47d