paulhorn/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge updates from trunk.

Browse Source 
FossilOrigin-Name: b42c2e2076da1a61f667876ff2c18e4ebed50a7f
This commit is contained in:
mistachkin
2015-09-13 18:43:53 +00:00
parent e7c4184348 2e25a00019
commit b25754a62d
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manifest
+5 -5
View File
@@ -1,5 +1,5 @@
C Merge\supdates\sfrom\strunk. C Merge\supdates\sfrom\strunk.
D 2015-09-12T18:58:32.998 D 2015-09-13T18:43:53.759
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239 F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -342,7 +342,7 @@ F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2 F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42 F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
F src/sqlite.h.in dbaf8c3796e80221de4395b5f4f872abddb5f89f F src/sqlite.h.in b7386d2bae6a43ba35be56e0d495b8725998101e
F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308 F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
F src/sqliteInt.h d7b2c30947a49a7538f24c0dca253c0e456c849c F src/sqliteInt.h d7b2c30947a49a7538f24c0dca253c0e456c849c
@@ -1386,7 +1386,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 4859778900a99e7e50ce3d56910ad4c5469f2cdb 334720c01722478af0d3dfd6fe8bafd88ba09f49 P d8051f611acabc2aaf8d23e8707c2a45961be416 786333e05a75406bbd0b5c9c7beb8f16022eabec
R cfc16eded5405e1561a759b6078e93d0 R c5f00344bef9784bebe4d7d63d1f470a
U mistachkin U mistachkin
Z 39e49f321343f38df06dd77bd41d446b Z ed5385a43675afcca5c372bcd0fa06ab
manifest.uuid
+1 -1
View File
@@ -1 +1 @@
d8051f611acabc2aaf8d23e8707c2a45961be416 b42c2e2076da1a61f667876ff2c18e4ebed50a7f
src/sqlite.h.in
+7 -5
View File
@@ -124,7 +124,7 @@ extern "C" {
** but are associated with the library instead of the header file. ^(Cautious ** but are associated with the library instead of the header file. ^(Cautious
** programmers might include assert() statements in their application to ** programmers might include assert() statements in their application to
** verify that values returned by these interfaces match the macros in ** verify that values returned by these interfaces match the macros in
** the header, and thus insure that the application is ** the header, and thus ensure that the application is
** compiled with matching library and header files. ** compiled with matching library and header files.
** **
** <blockquote><pre> ** <blockquote><pre>
@@ -374,7 +374,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
** Restrictions: ** Restrictions:
** **
** <ul> ** <ul>
** <li> The application must insure that the 1st parameter to sqlite3_exec() ** <li> The application must ensure that the 1st parameter to sqlite3_exec()
** is a valid and open [database connection]. ** is a valid and open [database connection].
** <li> The application must not close the [database connection] specified by ** <li> The application must not close the [database connection] specified by
** the 1st parameter to sqlite3_exec() while sqlite3_exec() is running. ** the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
@@ -1367,9 +1367,11 @@ int sqlite3_os_end(void);
** applications and so this routine is usually not necessary. It is ** applications and so this routine is usually not necessary. It is
** provided to support rare applications with unusual needs. ** provided to support rare applications with unusual needs.
** **
** The sqlite3_config() interface is not threadsafe. The application ** <b>The sqlite3_config() interface is not threadsafe. The application
** must insure that no other SQLite interfaces are invoked by other ** must ensure that no other SQLite interfaces are invoked by other
** threads while sqlite3_config() is running. Furthermore, sqlite3_config() ** threads while sqlite3_config() is running.</b>
**
** The sqlite3_config() interface
** may only be invoked prior to library initialization using ** may only be invoked prior to library initialization using
** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()]. ** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
** ^If sqlite3_config() is called after [sqlite3_initialize()] and before ** ^If sqlite3_config() is called after [sqlite3_initialize()] and before