Update apple-osx branch with the latest trunk changes.

FossilOrigin-Name: fb7ad09dec805ccb709b138509d6e1eb77323c2f

diff --cc main.mk
Simple merge

diff --cc manifest
index ce58bd969fe5b9f79934349781c9a47e2ab5b415,bb6eff7db11f6a4eb6602665cf7b994a1d12d629..4816b491be05bf77c7aaf6c274997933f7f49a50
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2011-06-21T01:30:53.231
 -C Change\sa\stest\scase\sin\stypes3.test\sslightly\sso\sthat\sit\sworks\swith\sthe\slatest\sversions\sof\sTcl.
 -D 2011-06-22T10:56:54.742
++C Update\sapple-osx\sbranch\swith\sthe\slatest\strunk\schanges.
++D 2011-06-22T11:24:56
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 +F Makefile.in 8410b02448997eb43bdf0ffa482c9bc2d2624e45
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc c942f2ceb9385d6c75b01ee3d38d8a189fb76e8c
+ F Makefile.msc 11082f65b452b908d93013292c17850378c39284
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 3fcdd7fbe3eb282df3978fe77288544543767961
@@@ -102,12 -102,9 +102,12 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  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 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk fffabd0d16174b622792e26f6caf6e661f388a1c
 -F main.mk d799fb600383cee11fed58876a7cccb749dd2614
++F main.mk b2f00a81c37fbce7098d77c58eb816d9bd94d3d3
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -139,20 -136,20 +139,20 @@@ F src/delete.c cecc926c70783452f3e8eb45
  F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 9fabba17a4d4778dc660f0cb9d781fc86d7b9d41
 -F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
 +F src/func.c 1b9d471b632d8529e0f86b7bd2b918dcc2cb1097
- F src/global.c 29bfb85611dd816b04f10fba0ca910366e128d38
+ F src/global.c c70a46f28680f8d7c097dbc0430ccf3b932e90b0
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 3eea5a53d2644116fb865afaa4699fabe62b441c
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
- F src/main.c 42f2493a1662a2dee5ac56a05b05c0c545ae6d92
 -F src/main.c fa654e1802e14a5f6c09c37971c3b69c1001d9c8
++F src/main.c fbe239ee3e61b0e83a8d53028e9efaf8368bc73f
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 +F src/mem1.c 46095d62b241466ef51970e592aa3a7a87e443e1
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -184,15 -181,14 +184,15 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
  F src/shell.c 0e0173b3e79d956368013e759f084caa7995ecb1
- F src/sqlite.h.in a4d0baabe4f86b3ab9cf56eda23dfd9d022ece0a
+ F src/sqlite.h.in 4b7255c10d39c5faf089dbd29cde7c367ff39f1f
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 7b7ec2394b94fc4516930cd9dae37af0f9312215
+ F src/sqliteInt.h a9248d3b0d2b1cf428d8642320fb13044a8888e0
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 5db825be61708b1a2b3f8f6e185e9b753829acef
- F src/test1.c 5c8be86cba3ac703c765730b7dd1ec62bf84e750
 -F src/test1.c ce2fab9e36932f5771c35291539366c9af229df3
++F src/test1.c 4b3b4e58c3f9457d9e8fb0a6d437215c64287b76
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -621,7 -616,7 +621,7 @@@ F test/pagesize.test 76aa9f23ecb0741a4e
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
  F test/permutations.test 1e8892ebf1bd6e9e8036f4841c72a91bf72da74a
- F test/pragma.test 88048136eed6baa2097dd7ab5145d3288128ca70
 -F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
++F test/pragma.test 9b08f84e691065281c5e705988a754bf26c2bfaa
  F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
  F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -697,10 -692,10 +697,10 @@@ F test/sysfault.test c79441d88d23696fbe
  F test/table.test 04ba066432430657712d167ebf28080fe878d305
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
- F test/tester.tcl 54a2028984500c76dcfbef6e927ef23ef1141515
 -F test/tester.tcl 7d3d17914ca5397a82f801db733b81d4a82f50c3
++F test/tester.tcl 801cb7ba763bf5a19475cfb865ad55dddb39ad6a
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -949,9 -945,10 +950,10 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
+ F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P 4c69e827f4d65e597e125e0d6691b0c8fb5588d7 e60eefc76fa5066720d76858f6cfca56365330ee
- R 57a0e9a4fabd4995959d9cd71e887832
- U drh
- Z 5c6f3f32328535fdb642daa473cdb5a8
 -P 065e5a5ea4f82f0d3fbb2e80d3a977af96c95683
 -R bb24e8ea6743b27a72518b27f4017512
++P 76005fdca05d86f91e424698d86942264419c616 6e1f4df51ad32e36715cba16f9df0d17a08dc653
++R 3fe8d8ccf923ead718e0d406962ef41f
+ U dan
 -Z 83a2b05b96f2ad1cc32e9a94b3d4ad63
++Z 7cc1c43d462645d28cf861dabb055fe3

diff --cc manifest.uuid
index ad13351b32f6da694fe9bbf3d24e2bc25cc7364d,9ca9b68227de671286c63165cc38a996d72762b2..9a8b5cfbfd1ebd6952c4bfb7f978a20bb5ea7846
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 76005fdca05d86f91e424698d86942264419c616
 -6e1f4df51ad32e36715cba16f9df0d17a08dc653
++fb7ad09dec805ccb709b138509d6e1eb77323c2f

diff --cc src/main.c
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc test/pragma.test
index 8cbfef54348b7737ce2119ac886fd3889e53330f,4b4418299cb4c6874912032fe290d8c490c38908..f2ef3a069d466b32354d32aac0c4b9438d434110
--- 1/test/pragma.test
--- 2/test/pragma.test
+++ b/test/pragma.test
@@@ -1311,18 -1306,21 +1311,18 @@@ if !$skip_lock_proxy_tests 
    set env(SQLITE_FORCE_PROXY_LOCKING) "0"
  
    sqlite3 db test.db
-   set lpp [exec mktemp -t 'proxy1']
 +  # set lock proxy name and then query it via pragma interface
++  set lpp [exec mktemp -t "proxy1"]
    do_test pragma-16.1 {
 -    execsql {
 -      PRAGMA lock_proxy_file="mylittleproxy";
 -      select * from sqlite_master;
 -    }
 -    execsql {
 -      PRAGMA lock_proxy_file;
 -    } 
 -  } {mylittleproxy}
 +    execsql "PRAGMA lock_proxy_file='$lpp'"
 +    execsql "select * from sqlite_master"
 +    execsql "PRAGMA lock_proxy_file"
 +  } $lpp
  
 +  # 2 database connections can share a lock proxy file
    do_test pragma-16.2 {
      sqlite3 db2 test.db
 -    execsql {
 -      PRAGMA lock_proxy_file="mylittleproxy";
 -    } db2
 +    execsql "PRAGMA lock_proxy_file='$lpp'" db2
    } {}
  
    db2 close
@@@ -1333,16 -1330,17 +1333,16 @@@
        PRAGMA lock_proxy_file=":auto:";
        select * from sqlite_master;
      } db2
 -    execsql {
 -      PRAGMA lock_proxy_file;
 -    } db2
 -  } {mylittleproxy}
 +    execsql "PRAGMA lock_proxy_file" db2
 +  } $lpp
  
    db2 close
-   set lpp2 [exec mktemp -t 'proxy2']
++  set lpp2 [exec mktemp -t "proxy2"]
 +
 +  # 2nd database connection cannot override the lock proxy file
    do_test pragma-16.3 {
      sqlite3 db2 test.db
 -    execsql {
 -      PRAGMA lock_proxy_file="myotherproxy";
 -    } db2
 +    execsql "PRAGMA lock_proxy_file='$lpp2'" db2
      catchsql {
        select * from sqlite_master;
      } db2

diff --cc test/tester.tcl
Simple merge