Merge updates from trunk.

FossilOrigin-Name: e65db42c9fdc1d6f257c8db54a46ee4fc0d7aaf0

diff --cc manifest
index d49399a0cafc4004a62255397ad6f6ca7e16824b,b8aa30008039cc2503a9a9bbbfa727a24c377002..9fbe50fb3b9df829ff00a7bc51f9b57d0c6e551b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
 -C Ensure\sthe\sVerifyCookie\ssub-routine\shas\sbeen\srun\sbefore\sthe\sdatabase\sis\saccessed\sin\san\sobscure\scase.\sFix\sfor\sticket\s[d6b36be38].
 -D 2012-12-07T19:28:26.162
 +C Merge\supdates\sfrom\strunk.
- D 2012-10-16T23:08:28.778
++D 2012-12-08T06:46:05.624
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
+ F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1d8a5d3cf33b8b8d3247c99367a37af384cc7ebd
+ F Makefile.msc 5a3b6f34d263b01f8b798c291fac1529fd650308
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
@@@ -129,21 -129,21 +129,21 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 72a70dcfda75d3a1f81041ce4573e7afddcd8e4e
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c e35684ad93c741266b086610d2efd709b7946853
- F src/expr.c 57fb8e7a05d4147e40b9f4c439e37ed2abab9332
+ F src/delete.c 9b8d308979114991e5dc7cee958316e07186941d
+ F src/expr.c 3b25a95f3d309403940ba4a3212f197b8b6251d5
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c c82a04e7a92bb728f9ab972b76590403283be2af
- F src/func.c cbb90dc84b22eea25caf39528d342279e61b8898
- F src/global.c 617cf51a1c34d304e29843edb105f99562da2bf7
- F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
+ F src/func.c 8147799b048065a1590805be464d05b4913e652c
 -F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
++F src/global.c 36c6d6600b53d0ae68189d6b5fdc04b7bf90f190
+ F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c ad0d8943d2a4f0b52ebf75b9e459f2da00117dbd
- F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
+ F src/insert.c d7ed04b1fab887d6d26cf5e36753f5d6d1246290
+ F src/journal.c eb7b9f5e783266521bcd9b2b93d419a219411f71
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 8636ce7c8cdb5d8da672faa5577dbb5da0c6f4ff
 -F src/main.c 448564ee3795b13c373bbc5c8590df8fbfe1d64c
++F src/main.c b24c1a6a7fe732cb766a67111a17cc6369f9fc3c
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -174,17 -174,17 +174,17 @@@ F src/printf.c 4a9f882f1c1787a8b494a298
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 7b986a715ac281643309c29257bb58cfae7aa810
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c 9b759521f805e25e97baa2dd64037157fe365817
- F src/shell.c 8ee5a3cb502e2d574f97b43972e6c1e275e7bec7
- F src/sqlite.h.in 702c03d8036b6e0a5fac2fcb704d9df628e3d097
+ F src/select.c 1462a391952c7659168460fe2d7eed7d41529be1
+ F src/shell.c e392dd1ccbb77cc1d75a8367a89b473c24bea019
 -F src/sqlite.h.in e5552743b5b74dc675ebbdedd849ba8283424fa9
++F src/sqlite.h.in 7d2e9e4d3be5950d0a87029dbae054d0df36f9c8
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 3fad6e332ddd06b89de62c8f8abccfa61e63577b
 -F src/sqliteInt.h 666935d603a7354d90e7ddfe040e3afdd1d8ee16
++F src/sqliteInt.h b9d79d391e3ebff3fbe899bed330b1223958b5d8
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
- F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
+ F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 515abd8e33e82aa330eeb54675185a7e1e5b6778
- F src/test1.c 936afc02766403e5debca49a1817a780e116df7e
+ F src/test1.c f62769c989146149590662ab02de4a813813a9c5
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa
@@@ -205,12 -205,12 +205,12 @@@ F src/test_fuzzer.c 1d26aa965120420bc14
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
  F src/test_intarray.c 07ddcebe4097d400ffca362770f1d883c112387a
- F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
+ F src/test_intarray.h b999bb18d090b8d9d9c49d36ec37ef8f341fe169
  F src/test_journal.c f5c0a05b7b3d5930db769b5ee6c3766dc2221a64
  F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
- F src/test_malloc.c b813ffd7e62f5abe2f69cbe94ee3519f77147341
 -F src/test_malloc.c 6982a357a6a6c24f281b91c89303a5c31075c392
++F src/test_malloc.c c0f02f9fa48495b8d0a63ab90318566a9eed9758
  F src/test_multiplex.c ac0fbc1748e5b86a41a1d7a84654fae0d53a881d
- F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
+ F src/test_multiplex.h 9b63b95f07acedee425fdfe49a47197c9bf5f9d8
  F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
  F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25
  F src/test_osinst.c 90a845c8183013d80eccb1f29e8805608516edba
@@@ -634,11 -636,11 +636,11 @@@ F test/notify2.test 9503e51b9a272a5405c
  F test/notify3.test a86259abbfb923aa27d30f0fc038c88e5251488a
  F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
 -F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
 +F test/openv2.test 74c994537a13c7e31982d597eab555491133cee4
- F test/orderby1.test ef4f7c40df81b9a4303a718433d34052f07db47d
+ F test/orderby1.test f33968647da5c546528fe4d2bf86c6a6a2e5a7ae
  F test/orderby2.test bc11009f7cd99d96b1b11e57b199b00633eb5b04
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
- F test/pager1.test 07116f72a61960b882952e7472cc2846d161d6e2
+ F test/pager1.test f4c57e14583da2183fe31555c67fb32feda96092
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
@@@ -1020,8 -1024,8 +1024,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P bbb0d189b7b6aecfc0e0b6c2bcd9f49aaea8c34a 2c3af657fee6153842d660a6ce29aa7d791ebd38
- R 42f368ad563e093cbc431b2b6eab1115
+ F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
 -P df1827b19e47724b62fdf6fbedfd4e61add343d3
 -R d9a49317c83cd75d961bd50ea4d2b4bf
 -U dan
 -Z 4659749d4c8a1f0da88866b82eed162a
++P f021559d8a23934e3bdccad5b55fc7a91d185f53 2d5f37c99a9e5377409697f5392a1ca55970964e
++R fefd32a0ceb384fa3fe738352308f54d
 +U mistachkin
- Z cf0b8626aab699edec5e3c0c8e82ca94
++Z 2163da0146cd8798981d552092368646

diff --cc manifest.uuid
index cd10ab6cf3cdc6b46a85906803501fc76f293aeb,af837a3c73c0280d0381c68e692df271fafa97ee..476eaea8de1c008e4073afc67a36e67d6e56cc4e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f021559d8a23934e3bdccad5b55fc7a91d185f53
 -2d5f37c99a9e5377409697f5392a1ca55970964e
++e65db42c9fdc1d6f257c8db54a46ee4fc0d7aaf0

diff --cc src/global.c
Simple merge

diff --cc src/main.c
index f29cb35b2b49285059dabfbb2035914a07383047,b52d4744431468bd819f285f2b4fbce06685d367..181c0d07feea43be1a14c35a0e640851baf5ed22
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -480,45 -487,15 +487,54 @@@ int sqlite3_config(int op, ...)
        break;
      }
  
+ #ifdef SQLITE_ENABLE_SQLLOG
+     case SQLITE_CONFIG_SQLLOG: {
+       typedef void(*SQLLOGFUNC_t)(void*, sqlite3*, const char*, int);
+       sqlite3GlobalConfig.xSqllog = va_arg(ap, SQLLOGFUNC_t);
+       sqlite3GlobalConfig.pSqllogArg = va_arg(ap, void *);
+       break;
+     }
+ #endif
+ 
 +    case SQLITE_CONFIG_READONLY: {
 +      sqlite3GlobalConfig.bReadOnly = va_arg(ap, int);
 +      break;
 +    }
 +
 +    default: {
 +      rc = SQLITE_ERROR;
 +      break;
 +    }
 +  }
 +  va_end(ap);
 +  return rc;
 +}
 +
 +/*
 +** This API allows applications to modify the global configuration of
 +** the SQLite library at run-time.
 +**
 +** This routine differs from sqlite3_config() in that it may be called when
 +** there are outstanding database connections and/or memory allocations.
 +** This routine is threadsafe.
 +*/
 +int sqlite3_reconfig(int op, ...){
 +  va_list ap;
 +  int rc = SQLITE_OK;
 +
 +  va_start(ap, op);
 +  switch( op ){
 +    case SQLITE_CONFIG_READONLY: {
 +      /*
 +      ** On platforms where assignment of an integer value is atomic, there
 +      ** is no need for a mutex here.  On other platforms, there could be a
 +      ** subtle race condition here; however, the effect would simply be that
 +      ** a call to open a database would fail with SQLITE_READONLY.
 +      */
 +      sqlite3GlobalConfig.bReadOnly = va_arg(ap, int);
 +      break;
 +    }
 +
      default: {
        rc = SQLITE_ERROR;
        break;

diff --cc src/sqlite.h.in
index a9c591507d2f4be1e2011ec06bd82872d132c4ce,0bf0be5fcff3a17cee162e05b07caac66f99e8c8..d08dd7b340c8f58b796c115f64727eb848871a80
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -1632,7 -1640,7 +1659,8 @@@ struct sqlite3_mem_methods 
  #define SQLITE_CONFIG_PCACHE2      18  /* sqlite3_pcache_methods2* */
  #define SQLITE_CONFIG_GETPCACHE2   19  /* sqlite3_pcache_methods2* */
  #define SQLITE_CONFIG_COVERING_INDEX_SCAN 20  /* int */
- #define SQLITE_CONFIG_READONLY     21  /* int */
+ #define SQLITE_CONFIG_SQLLOG       21  /* xSqllog, void* */
++#define SQLITE_CONFIG_READONLY     22  /* int */
  
  /*
  ** CAPI3REF: Database Connection Configuration Options

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_malloc.c
Simple merge