diff options
| author | Alex Naidis <alex.naidis@linux.com> | 2017-04-01 00:13:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-01 00:13:15 +0000 |
| commit | 6fa055b1eb15c5683af9999d24ecca510ec5f552 (patch) | |
| tree | d5b7523d49c2f7cd735f9b71bc250ed6232babfd /dist/Android.patch | |
| parent | 71b61e07c4cf42708d9c5034aca9091c6f7388d7 (diff) | |
| parent | d729aff1c5506ecb920e8fce4c2fd3cb35789e64 (diff) | |
Merge "sqlite: Upgrade to SQLite 3.18.0"
am: d729aff1c5
Change-Id: If0801012ece26d30f4a8d21300fa6ad5822636ae
Diffstat (limited to 'dist/Android.patch')
| -rw-r--r-- | dist/Android.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/dist/Android.patch b/dist/Android.patch index bc6e900..00546fe 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 2017-02-13 17:25:42.000000000 +0100 -+++ ./shell.c 2017-02-13 18:20:38.582995110 +0100 +--- orig/shell.c 2017-03-30 16:26:46.000000000 +0200 ++++ ./shell.c 2017-03-31 14:07:49.938488981 +0200 @@ -52,6 +52,12 @@ #endif #include <ctype.h> @@ -14,10 +14,10 @@ diff -r -u -d orig/shell.c ./shell.c #if !defined(_WIN32) && !defined(WIN32) # include <signal.h> -@@ -2442,6 +2448,22 @@ - readfileFunc, 0, 0); - sqlite3_create_function(p->db, "writefile", 2, SQLITE_UTF8, 0, - writefileFunc, 0, 0); +@@ -3387,6 +3393,22 @@ + sha3QueryFunc, 0, 0); + sqlite3_create_function(p->db, "sha3_query", 2, SQLITE_UTF8, 0, + sha3QueryFunc, 0, 0); + + // Begin Android Add + #ifndef NO_ANDROID_FUNCS @@ -38,9 +38,9 @@ diff -r -u -d orig/shell.c ./shell.c } diff -r -u -d orig/sqlite3.c ./sqlite3.c ---- orig/sqlite3.c 2017-02-13 17:25:42.000000000 +0100 -+++ ./sqlite3.c 2017-02-13 18:20:38.613994512 +0100 -@@ -33438,7 +33438,7 @@ +--- orig/sqlite3.c 2017-03-30 16:26:46.000000000 +0200 ++++ ./sqlite3.c 2017-03-31 14:05:07.474694595 +0200 +@@ -33497,7 +33497,7 @@ SimulateIOError( rc=1 ); if( rc!=0 ){ storeLastErrno((unixFile*)id, errno); @@ -49,7 +49,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c } *pSize = buf.st_size; -@@ -33474,7 +33474,7 @@ +@@ -33533,7 +33533,7 @@ struct stat buf; /* Used to hold return values of fstat() */ if( osFstat(pFile->h, &buf) ){ @@ -58,7 +58,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c } nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk; -@@ -34048,7 +34048,7 @@ +@@ -34107,7 +34107,7 @@ ** with the same permissions. */ if( osFstat(pDbFd->h, &sStat) ){ @@ -67,7 +67,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c goto shm_open_err; } -@@ -115193,7 +115193,7 @@ +@@ -115660,7 +115660,7 @@ } if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){ sqlite3SetString(pzErrMsg, db, "unsupported file format"); @@ -76,7 +76,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c goto initone_error_out; } -@@ -148659,13 +148659,25 @@ +@@ -149201,13 +149201,25 @@ ** module with sqlite. */ if( SQLITE_OK==rc |