diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2017-06-22 04:52:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-06-22 04:52:58 +0000 |
| commit | 39a32b46137c57b816e71d73438e4fac69b6b9d6 (patch) | |
| tree | b5266517d1dded5a2f24a60a094b1ad93794f258 /dist/Android.patch | |
| parent | 47908a131569302641f824f67465d13243411b1b (diff) | |
| parent | 4436df80ecd8f0e6d1868ea43f7dde0772f04bd8 (diff) | |
Merge "Revert "sqlite: Upgrade to SQLite 3.19.3""
Diffstat (limited to 'dist/Android.patch')
| -rw-r--r-- | dist/Android.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dist/Android.patch b/dist/Android.patch index 095b973..98b9f1f 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-06-08 17:09:50.000000000 +0200 -+++ ./shell.c 2017-06-08 18:08:52.586798733 +0200 +--- orig/shell.c 2017-05-24 17:13:50.000000000 +0200 ++++ ./shell.c 2017-05-24 19:24:05.290434785 +0200 @@ -52,6 +52,12 @@ #endif #include <ctype.h> @@ -38,8 +38,8 @@ diff -r -u -d orig/shell.c ./shell.c } diff -r -u -d orig/sqlite3.c ./sqlite3.c ---- orig/sqlite3.c 2017-06-08 17:09:50.000000000 +0200 -+++ ./sqlite3.c 2017-06-08 18:08:52.641797754 +0200 +--- orig/sqlite3.c 2017-05-24 17:13:50.000000000 +0200 ++++ ./sqlite3.c 2017-05-24 19:24:05.339433935 +0200 @@ -33542,7 +33542,7 @@ SimulateIOError( rc=1 ); if( rc!=0 ){ @@ -67,7 +67,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c goto shm_open_err; } -@@ -115934,7 +115934,7 @@ +@@ -115926,7 +115926,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; } -@@ -149769,13 +149769,25 @@ +@@ -149753,13 +149753,25 @@ ** module with sqlite. */ if( SQLITE_OK==rc |