summaryrefslogtreecommitdiff
path: root/dist/Android.patch
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-08-20 16:41:25 -0700
committerJeff Brown <jeffbrown@google.com>2014-08-20 16:46:21 -0700
commit9bee60b0fc0b60d4ae9e7533e0e6b7beca5f37fc (patch)
tree776516a7af23786b4cceaa1267b410b4ccb3329f /dist/Android.patch
parente473f2fc6652e4c92c1045e818cb64e5c554ab04 (diff)
Upgrade SQLite to v3.8.6.
Bug: 15526305 Change-Id: Ib2c187345f845a0f86e25851b7d657c73e9b4ee4
Diffstat (limited to 'dist/Android.patch')
-rw-r--r--dist/Android.patch37
1 files changed, 19 insertions, 18 deletions
diff --git a/dist/Android.patch b/dist/Android.patch
index e75c496..4b8ef9d 100644
--- a/dist/Android.patch
+++ b/dist/Android.patch
@@ -1,6 +1,6 @@
diff -r -u -d orig/shell.c ./shell.c
---- orig/shell.c 2014-06-06 19:38:15.429111362 -0700
-+++ ./shell.c 2014-06-06 19:38:49.789261069 -0700
+--- orig/shell.c 2014-08-20 16:26:07.117256041 -0700
++++ ./shell.c 2014-08-20 16:45:00.468546769 -0700
@@ -35,6 +35,11 @@
#include "sqlite3.h"
#include <ctype.h>
@@ -13,10 +13,11 @@ diff -r -u -d orig/shell.c ./shell.c
#if !defined(_WIN32) && !defined(WIN32)
# include <signal.h>
-@@ -1658,6 +1663,20 @@
- #ifndef SQLITE_OMIT_LOAD_EXTENSION
- sqlite3_enable_load_extension(p->db, 1);
- #endif
+@@ -1737,6 +1742,21 @@
+ readfileFunc, 0, 0);
+ sqlite3_create_function(db, "writefile", 2, SQLITE_UTF8, 0,
+ writefileFunc, 0, 0);
++
+ // Begin Android Add
+ #ifndef NO_ANDROID_FUNCS
+ int err = register_localized_collators(db, "en_US", 0);
@@ -35,9 +36,9 @@ diff -r -u -d orig/shell.c ./shell.c
}
diff -r -u -d orig/sqlite3.c ./sqlite3.c
---- orig/sqlite3.c 2014-06-06 19:38:15.999113846 -0700
-+++ ./sqlite3.c 2014-06-06 19:38:49.829261244 -0700
-@@ -23766,6 +23766,13 @@
+--- orig/sqlite3.c 2014-08-20 16:26:07.145255923 -0700
++++ ./sqlite3.c 2014-08-20 16:26:36.205134826 -0700
+@@ -24109,6 +24109,13 @@
*/
#if SQLITE_OS_UNIX /* This file is used on unix only */
@@ -51,7 +52,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
/*
** There are various methods for file locking used for concurrency
** control:
-@@ -24314,7 +24321,12 @@
+@@ -24660,7 +24667,12 @@
#else
{ "pread64", (sqlite3_syscall_ptr)0, 0 },
#endif
@@ -64,7 +65,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
{ "write", (sqlite3_syscall_ptr)write, 0 },
#define osWrite ((ssize_t(*)(int,const void*,size_t))aSyscall[11].pCurrent)
-@@ -24332,8 +24344,14 @@
+@@ -24678,8 +24690,14 @@
#else
{ "pwrite64", (sqlite3_syscall_ptr)0, 0 },
#endif
@@ -79,7 +80,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
{ "fchmod", (sqlite3_syscall_ptr)fchmod, 0 },
#define osFchmod ((int(*)(int,mode_t))aSyscall[14].pCurrent)
-@@ -27564,7 +27582,7 @@
+@@ -27909,7 +27927,7 @@
SimulateIOError( rc=1 );
if( rc!=0 ){
((unixFile*)id)->lastErrno = errno;
@@ -88,7 +89,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
}
*pSize = buf.st_size;
-@@ -27599,7 +27617,9 @@
+@@ -27944,7 +27962,9 @@
i64 nSize; /* Required file size */
struct stat buf; /* Used to hold return values of fstat() */
@@ -99,7 +100,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk;
if( nSize>(i64)buf.st_size ){
-@@ -28162,7 +28182,7 @@
+@@ -28510,7 +28530,7 @@
** with the same permissions.
*/
if( osFstat(pDbFd->h, &sStat) && pInode->bProcessLock==0 ){
@@ -108,7 +109,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
goto shm_open_err;
}
-@@ -29500,7 +29520,7 @@
+@@ -29848,7 +29868,7 @@
*pUid = sStat.st_uid;
*pGid = sStat.st_gid;
}else{
@@ -117,7 +118,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
}
}else if( flags & SQLITE_OPEN_DELETEONCLOSE ){
*pMode = 0600;
-@@ -100013,7 +100033,7 @@
+@@ -100867,7 +100887,7 @@
}
if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){
sqlite3SetString(pzErrMsg, db, "unsupported file format");
@@ -126,7 +127,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
goto initone_error_out;
}
-@@ -123686,9 +123706,9 @@
+@@ -124770,9 +124790,9 @@
#endif
#ifdef SQLITE_ENABLE_FTS3
@@ -139,7 +140,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c
#endif
#ifdef SQLITE_ENABLE_ICU
-@@ -129566,16 +129586,28 @@
+@@ -130660,16 +130680,28 @@
** module with sqlite.
*/
if( SQLITE_OK==rc