diff --git a/manifest b/manifest index d3c4630ea2..8b05204af1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sto\s#undef\sstatements\sto\sthe\scommand-line\sshell,\sgo\smake\ssure\sthat\sthe\nmacros\sdefinitions\sthat\sfollow\sdo\snot\scollide\swith\ssystem\sdefinitions. -D 2012-08-27T21:19:03.083 +C Update\sAPI\sdocs\sto\sinclude\snotes\sabout\sthe\sWinRT\stemporary\sdirectory.\s\sNo\schanges\sto\scode. +D 2012-08-28T00:09:58.692 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -178,7 +178,7 @@ F src/resolve.c 9e28280ec98035f31900fdd1db01f86f68ca6c32 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c 7c62350de1d619d058030f8dc2b11a95cfde77ac F src/shell.c 87953c5d9c73d9494db97d1607e2e2280418f261 -F src/sqlite.h.in b20d50c7efe592aa9420386937c26fe8efd9e0d1 +F src/sqlite.h.in 53a8235ebece1090111da51f18833bdf3fbd869c F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477 F src/sqliteInt.h 053e03a532beb909ead2df0721db67cdb4c48ae8 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d @@ -1013,7 +1013,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 -P 4ccc18e999c51f7f6637ee48ccca35c7706bfe6d -R 740204f7686a3b17a40ffeda3efe6cd4 -U drh -Z 48561ad81823df9fc82c051aa08e231e +P 24420d6d2077d745cc26dd269e76b48c8a3eeb3c +R 4d7c239911bd7fa3f3e3c10e34cdda68 +U mistachkin +Z 594734f9dc4d43e32a96faebd1a64aa9 diff --git a/manifest.uuid b/manifest.uuid index e7779398bf..56e6b3eab0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -24420d6d2077d745cc26dd269e76b48c8a3eeb3c \ No newline at end of file +eaeeb0699297dde824788e2907a0cfd2acd8f642 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 894c6b86fe..11406afacd 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2662,6 +2662,12 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** codepage is currently defined. Filenames containing international ** characters must be converted to UTF-8 prior to passing them into ** sqlite3_open() or sqlite3_open_v2(). +** +** Note to Windows Runtime users: The temporary directory must be set +** prior to calling sqlite3_open() or sqlite3_open_v2(). Otherwise, various +** features that require the use of temporary files may fail. +** +** See also: [sqlite3_temp_directory] */ int sqlite3_open( const char *filename, /* Database filename (UTF-8) */ @@ -4466,6 +4472,24 @@ int sqlite3_sleep(int); ** Hence, if this variable is modified directly, either it should be ** made NULL or made to point to memory obtained from [sqlite3_malloc] ** or else the use of the [temp_store_directory pragma] should be avoided. +** +** Note to Windows Runtime users: The temporary directory must be set +** prior to calling [sqlite3_open] or [sqlite3_open_v2]. Otherwise, various +** features that require the use of temporary files may fail. Here is an +** example of how to do this using C++ with the Windows Runtime: +** +**
+** LPCWSTR zPath = Windows::Storage::ApplicationData::Current->
+**     TemporaryFolder->Path->Data();
+**
+** char zPathBuf[MAX_PATH + 1];
+** memset(zPathBuf, 0, sizeof(zPathBuf));
+**
+** WideCharToMultiByte(CP_UTF8, 0, zPath, -1, zPathBuf, sizeof(zPathBuf),
+**     NULL, NULL);
+**
+** sqlite3_temp_directory = sqlite3_mprintf("%s", zPathBuf);
+** 
*/ SQLITE_EXTERN char *sqlite3_temp_directory;