diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-12-10 06:30:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-10 06:30:43 +0000 |
| commit | d1527c0f792780c0eddfd72b3afa1a9ffe1d9ae2 (patch) | |
| tree | cfb22384ffe1217571497c4f79816c0dec81cda0 /dist/Android.patch | |
| parent | 8f362d835bb5506f4e27c67e5e558cc57295db5b (diff) | |
| parent | 7ba711e053994ade0e96f58ecd1839ac1b0db787 (diff) | |
Merge "sqlite: upgrade to SQLite 3.15.2"
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 e4ed6a4..acd7078 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 2016-11-04 19:21:18.000000000 +0100 -+++ ./shell.c 2016-11-05 15:37:30.041914978 +0100 +--- orig/shell.c 2016-11-29 04:29:24.000000000 +0900 ++++ ./shell.c 2016-12-06 00:58:36.768702411 +0900 @@ -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 2016-11-04 19:21:18.000000000 +0100 -+++ ./sqlite3.c 2016-11-05 15:37:30.071914348 +0100 +--- orig/sqlite3.c 2016-11-29 04:29:24.000000000 +0900 ++++ ./sqlite3.c 2016-12-06 00:58:36.787701965 +0900 @@ -33035,7 +33035,7 @@ SimulateIOError( rc=1 ); if( rc!=0 ){ @@ -67,7 +67,7 @@ diff -r -u -d orig/sqlite3.c ./sqlite3.c goto shm_open_err; } -@@ -113786,7 +113786,7 @@ +@@ -113802,7 +113802,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; } -@@ -147039,13 +147039,25 @@ +@@ -147060,13 +147060,25 @@ ** module with sqlite. */ if( SQLITE_OK==rc |