1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00

Merge recent trunk changes, include the R-Tree enhancement that allows

8-byte BLOB arguments to geometry functions, and the fix for the TEXT affinity
problem that could cause corrupt indexes.

FossilOrigin-Name: 0a0de8b72ca24f287f9c84766a14e12ea4564b59
This commit is contained in:
drh
2015-05-19 22:42:23 +00:00
52 changed files with 9845 additions and 4583 deletions

View File

@ -2201,7 +2201,7 @@ static void sessionAppendTableHdr(
** occurs, an SQLite error code is returned and both output variables set
** to 0.
*/
int sessionGenerateChangeset(
static int sessionGenerateChangeset(
sqlite3_session *pSession, /* Session object */
int bPatchset, /* True for patchset, false for changeset */
int (*xOutput)(void *pOut, const void *pData, int nData),
@ -2420,7 +2420,7 @@ int sqlite3session_isempty(sqlite3_session *pSession){
/*
** Do the work for either sqlite3changeset_start() or start_strm().
*/
int sessionChangesetStart(
static int sessionChangesetStart(
sqlite3_changeset_iter **pp, /* OUT: Changeset iterator handle */
int (*xInput)(void *pIn, void *pData, int *pnData),
void *pIn,
@ -4267,7 +4267,7 @@ static int sessionChangesetToHash(
**
** 3. Write an output changeset based on the contents of the hash table.
*/
int sessionChangesetConcat(
static int sessionChangesetConcat(
sqlite3_changeset_iter *pLeft,
sqlite3_changeset_iter *pRight,
int (*xOutput)(void *pOut, const void *pData, int nData),