Merge the changes need to compile on WinRT into trunk.

FossilOrigin-Name: 61360ca6ca3448477d5c662d3642beef6dd2079e

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 5ff19581aa0a49ce92dafa7ea55bf5fefa83d9c6,2e1af4b1b26fb6a4add21cd95aa27f273fae2ca2..1c81e6070aeb5f3acd47b06d1dd0118559d22a4f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Disable\sFTS\sunicode61\sby\sdefault.\sIt\sis\senabled\sby\sspecifying\scompile\stime\soption\sSQLITE_ENABLE_FTS4_UNICODE61.
- D 2012-06-06T19:51:27.734
 -C Correct\sdocs\sregarding\suse\sof\smalloc\sand\sfree\sby\sthe\sWindows\sVFS\slayer.\s\sNo\schanges\sto\scode.
 -D 2012-06-05T02:24:54.043
++C Merge\sthe\schanges\sneed\sto\scompile\son\sWinRT\sinto\strunk.
++D 2012-06-06T23:23:23.374
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 +F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 0891f992d012d6b2976f86e80a82ae6839fa9ded
 -F Makefile.msc f1450260e62a44bdd5fbb4f11389505167188df9
++F Makefile.msc fd86027849a59a2f621b791b79eabf3f8ffbd684
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 -F VERSION 1e25ebddd2ed5811c10bdabe914cd46d2dc38af8
 +F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -118,18 -113,18 +118,18 @@@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c
  F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
  F src/alter.c 149cc80d9257971b0bff34e58fb2263e01998289
  F src/analyze.c 70c46504c0d2543ea5cdca01140b2cd3e1d886e7
 -F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
 +F src/attach.c 577bf5675b0c50495fc28549f2fcbdb1bac71143
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 -F src/backup.c 6be23a344d3301ae38e92fddb3a33b91c309fce4
 +F src/backup.c d7fb4c6d2ad3fe51a4ce1a897fde7b00f4de5fef
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 -F src/btree.c df800f10896bc2ddaa1125c532d6e7a7b9efc532
 +F src/btree.c f0b71054103cb77eb5e782088c16998ec4f06624
  F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
  F src/btreeInt.h 38a639c0542c29fe8331a221c4aed0cb8686249e
 -F src/build.c 2bb2163bb1e69f59e9f36a9413079ead42fa1d2c
 +F src/build.c 47c4506afe4bcb4ed1f4b5357582d1cb3402f8ad
  F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
- F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
+ F src/ctime.c 500d019da966631ad957c37705642be87524463b
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
  F src/expr.c 06a7733d19dc725dc46ba51afd9feadb4b85d991
@@@ -145,7 -140,7 +145,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 41bfe7e14319b44f6322332bce2b48599e524f75
 -F src/main.c 57b7ebf64804621a3d783a359d8a4c6a4d256573
++F src/main.c 81e75dd5b37122369927b400b9e1322b73d725a7
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
@@@ -158,31 -153,31 +158,31 @@@ F src/mutex.h 2a79e0c10c26412546b501ee0
  F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
  F src/mutex_os2.c 882d735098c07c8c6a5472b8dd66e19675fe117f
  F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
- F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
+ F src/mutex_w32.c 1170f64d08dc35cd43f6d0bfa833cac5da979279
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
  F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
- F src/os.h 59beba555b65a450bd1d804220532971d4299f60
+ F src/os.h 38aabd5e3ecd4162332076f55bb09cec02165cca
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 -F src/os_unix.c 424d46e0edab969293c2223f09923b2178171f47
 +F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
- F src/os_win.c 412d6434133c7c81dc48b7702f3ea5e61c309e5c
+ F src/os_win.c e3d3d3e26b65a35d4293d753137a58510bd3299b
 -F src/pager.c bb5635dde0b152797836d1c72275284724bb563c
 -F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
 +F src/pager.c 9d4d6406512002d9a243ec27b9c01e93fda43e36
 +F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
  F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
- F src/pragma.c 28d7955a9e9a27d41cb462690228d39e3cec231c
 -F src/pragma.c 149d8400ff783741d41389176832241cbff8f856
 -F src/prepare.c 9a00a9612ebf80203fbb41f8a29ab8cb27a05f40
++F src/pragma.c eee3e3161f82a1e06f632a8d2a82b29ba3c45889
 +F src/prepare.c 33291b83cca285718048d219c67b8298501fa3a5
  F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
  F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
  F src/shell.c c16f72e34f611f060546709564c121a67cb2b31b
- F src/sqlite.h.in 922d2907cc2b0177b2c4a3b462f04937750d6edd
 -F src/sqlite.h.in 06a5141bdc5cc8959fe04bc0f59b0fe0ff742c90
++F src/sqlite.h.in f801a04e1ebd1c7f958017661545422ada06b9ce
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h 97ccae71ae0a4e924dcb9fab14eb4fc4839790da
 +F src/sqliteInt.h 29b5348f0056d9b46d0bb94d4853db21568afde9
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -199,8 -194,8 +199,8 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 -F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
 -F src/test_config.c 16f4bcb82fa82b39e92c8de49962a63b87e5faad
 +F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
- F src/test_config.c 86c4b1897fab385c949db398995eef3b75a2f1ad
++F src/test_config.c 4f7b8030287d62fe56a1d99e68b41760feae381a
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c 090f2c3339e85c2c964435f99aed6f3da9d59525
@@@ -389,7 -384,7 +389,7 @@@ F test/e_resolve.test dcce9308fb13b934c
  F test/e_select.test f5d4b81205701deacfae42051ae200969c41d2c0
  F test/e_select2.test 5c3d3da19c7b3e90ae444579db2b70098599ab92
  F test/e_update.test 161d5dc6a3ed9dd08f5264d13e20735d7a89f00c
- F test/e_uri.test cd2ddb4494c7ebf30b6e3539645bb4e54c0104b9
 -F test/e_uri.test 2a9f7fbc259751f49019cd8cb778a2e40eebb607
++F test/e_uri.test 32b8e0b99a0e215f25996516c64b90c525810d02
  F test/e_vacuum.test 331da289ae186656cf5f2eb27f577a89c0c221af
  F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
  F test/enc2.test 796c59832e2b9a52842f382ffda8f3e989db03ad
@@@ -642,16 -636,16 +642,16 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
 -F test/permutations.test dbda172249564f43ec556108a704581044c57dbd
 -F test/pragma.test eba5bd337ae68870985cd1776659bb136b33dada
 +F test/permutations.test ea7b6948eaa22993fcfa662eb704ce29ddb24b2a
- F test/pragma.test c51c148defe32bf4a419a522f95d26838d5cf677
++F test/pragma.test cb736bcc75b8b629af21ac0ad83ba1d054a2107b
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
  F test/quick.test 1681febc928d686362d50057c642f77a02c62e57
  F test/quota-glob.test 32901e9eed6705d68ca3faee2a06b73b57cb3c26
- F test/quota.test c2f778dab4c7fb07bcfa962cc5c762f36d8061dc
- F test/quota2.test 52175f1c94fb01711da38095a7d3988d0c7d6575
+ F test/quota.test b5b3eec55a059e0fe493c66c6e27bd2c07676cfd
 -F test/quota2.test de299a13c41e90101e48a725e31f9b7425da1356
++F test/quota2.test 6d2bd57e8a4da28817f46db9da18551211cd325f
  F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
  F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
  F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
@@@ -689,16 -683,15 +689,16 @@@ F test/selectA.test 06d1032fa9009314c95
  F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
  F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
- F test/shared.test 64fe647f17b2de0622437829a9e9823c20439fce
 -F test/shared.test 52e637790cc98727a64c3bdba330005354cebcab
++F test/shared.test 1acdf03fef43ea13604786424de8c4908170eece
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
  F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
  F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
  F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
 +F test/shared8.test b27befbefbe7f4517f1d6b7ff8f64a41ec74165d
  F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de
  F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
- F test/shell1.test 6e3013bc50e2b73f00d17e491f776decc82a71c8
+ F test/shell1.test 9895ee3013742a02e5afd8d77793729967ffd195
  F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a
  F test/shell3.test 9196c42772d575685e722c92b4b39053c6ebba59
  F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9
@@@ -1005,7 -998,7 +1005,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 790f76a5898dad1a955d40edddf11f7b0fec0ccd
- R b3b020dfaa40a6b886085c7104befb05
- U dan
- Z abcc18c27a4be2466863f9b79938e60e
 -P eb29e2d93984c29756430b55c08501d7e1783df0
 -R c0cc15c1965faab4224b374fdd762280
 -U mistachkin
 -Z 5d7036d126f9e49518f298514203b768
++P eccd6b6580637084495b80e9232262188ba0cf8d 8e8590a4dc8d9b0fa12ce288cdfd0146223fee6c
++R e54f5d64d1e08d0a0f77f7e82ee4ca4c
++U drh
++Z b901cb0ca598db2780e99899aea938ab

diff --cc manifest.uuid
index 19e951b7395eaa00f7b1b21088df6f48ce34ec0c,f1097a6089b5fd3f4072604b23983d39b226b501..ba2b7d536284f8e21833b43a5c706c4222a05567
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- eccd6b6580637084495b80e9232262188ba0cf8d
 -8e8590a4dc8d9b0fa12ce288cdfd0146223fee6c
++61360ca6ca3448477d5c662d3642beef6dd2079e

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
index 3401c73c1bc3195386167bac0897e6fa03d80617,2507acedf6a728c1c75f5373ef06a7700ea23154..b66290c0e83fadd04b8187e4d7d61586c91f98ac
--- 1/src/pragma.c
--- 2/src/pragma.c
+++ b/src/pragma.c
@@@ -804,6 -804,48 +804,50 @@@ void sqlite3Pragma
      }
    }else
  
++#if SQLITE_OS_WIN
+   /*
+   **   PRAGMA data_store_directory
+   **   PRAGMA data_store_directory = ""|"directory_name"
+   **
+   ** Return or set the local value of the data_store_directory flag.  Changing
+   ** the value sets a specific directory to be used for database files that
+   ** were specified with a relative pathname.  Setting to a null string reverts
+   ** to the default database directory, which for database files specified with
+   ** a relative path will probably be based on the current directory for the
+   ** process.  Database file specified with an absolute path are not impacted
+   ** by this setting, regardless of its value.
+   **
+   */
+   if( sqlite3StrICmp(zLeft, "data_store_directory")==0 ){
+     if( !zRight ){
+       if( sqlite3_data_directory ){
+         sqlite3VdbeSetNumCols(v, 1);
+         sqlite3VdbeSetColName(v, 0, COLNAME_NAME, 
+             "data_store_directory", SQLITE_STATIC);
+         sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, sqlite3_data_directory, 0);
+         sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
+       }
+     }else{
+ #ifndef SQLITE_OMIT_WSD
+       if( zRight[0] ){
+         int res;
+         rc = sqlite3OsAccess(db->pVfs, zRight, SQLITE_ACCESS_READWRITE, &res);
+         if( rc!=SQLITE_OK || res==0 ){
+           sqlite3ErrorMsg(pParse, "not a writable directory");
+           goto pragma_out;
+         }
+       }
+       sqlite3_free(sqlite3_data_directory);
+       if( zRight[0] ){
+         sqlite3_data_directory = sqlite3_mprintf("%s", zRight);
+       }else{
+         sqlite3_data_directory = 0;
+       }
+ #endif /* SQLITE_OMIT_WSD */
+     }
+   }else
++#endif
+ 
  #if !defined(SQLITE_ENABLE_LOCKING_STYLE)
  #  if defined(__APPLE__)
  #    define SQLITE_ENABLE_LOCKING_STYLE 1

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc test/e_uri.test
Simple merge

diff --cc test/pragma.test
index bb10327c3acfb03fb191b57754fef5d786e6e2dc,f8773f1b22cb01f97d961c51fe9ba476401d896c..e249897fe384551d56528f3306850434666d9775
--- 1/test/pragma.test
--- 2/test/pragma.test
+++ b/test/pragma.test
@@@ -1510,5 -1511,44 +1511,47 @@@ do_test pragma-19.5 
    file tail [lindex [execsql {PRAGMA filename}] 0]
  } {test.db}
  
++if {$tcl_platform(platform)=="windows"} {
+ # Test data_store_directory pragma
+ #
+ db close
+ sqlite3 db test.db
+ file mkdir data_dir
+ do_test pragma-20.1 {
+   catchsql {PRAGMA data_store_directory}
+ } {0 {}}
+ do_test pragma-20.2 {
+   set pwd [string map {' ''} [file nativename [get_pwd]]]
+   catchsql "PRAGMA data_store_directory='$pwd';"
+ } {0 {}}
+ do_test pragma-20.3 {
+   catchsql {PRAGMA data_store_directory}
+ } [list 0 [list [file nativename [get_pwd]]]]
+ do_test pragma-20.4 {
+   set pwd [string map {' ''} [file nativename \
+     [file join [get_pwd] data_dir]]]
+   catchsql "PRAGMA data_store_directory='$pwd';"
+ } {0 {}}
+ do_test pragma-20.5 {
+   sqlite3 db2 test2.db
+   catchsql "PRAGMA database_list;" db2
+ } [list 0 [list 0 main [file nativename \
+     [file join [get_pwd] data_dir test2.db]]]]
+ catch {db2 close}
+ do_test pragma-20.6 {
+   sqlite3 db2 [file join [get_pwd] test2.db]
+   catchsql "PRAGMA database_list;" db2
+ } [list 0 [list 0 main [file nativename \
+     [file join [get_pwd] test2.db]]]]
+ catch {db2 close}
+ do_test pragma-20.7 {
+   catchsql "PRAGMA data_store_directory='';"
+ } {0 {}}
+ do_test pragma-20.8 {
+   catchsql {PRAGMA data_store_directory}
+ } {0 {}}
+ 
+ forcedelete data_dir
++} ;# endif windows
 +
  finish_test

diff --cc test/quota2.test
Simple merge

diff --cc test/shared.test
Simple merge