Import SQLite 3.10.2.

third_party/sqlite/patches/0003-Exclude-journal-file-from-Time-Machine-if-database-i.patch

Index: third_party/sqlite/patches/0003-Exclude-journal-file-from-Time-Machine-if-database-i.patch
diff --git a/third_party/sqlite/patches/0004-Exclude-journal-file-from-Time-Machine-if-database-i.patch b/third_party/sqlite/patches/0003-Exclude-journal-file-from-Time-Machine-if-database-i.patch
similarity index 91%
rename from third_party/sqlite/patches/0004-Exclude-journal-file-from-Time-Machine-if-database-i.patch
rename to third_party/sqlite/patches/0003-Exclude-journal-file-from-Time-Machine-if-database-i.patch
index b9cf9d517401bc0428cdc2a2620a62461c8f691f..85151a2ba76dc11a8183f1c97615cbc50bae9dd6 100644
--- a/third_party/sqlite/patches/0004-Exclude-journal-file-from-Time-Machine-if-database-i.patch
+++ b/third_party/sqlite/patches/0003-Exclude-journal-file-from-Time-Machine-if-database-i.patch
@@ -1,7 +1,7 @@
-From edfff157e1d9292bfcce6553b76ee913b53b1aa1 Mon Sep 17 00:00:00 2001
+From bacae540479e7dc84bfbd059a20afa2ef00e8cdb Mon Sep 17 00:00:00 2001
 From: mrossetti <mrossetti@chromium.org>
 Date: Tue, 31 May 2011 23:12:11 +0000
-Subject: [PATCH 04/16] Exclude journal file from Time Machine if database is
+Subject: [PATCH 03/10] Exclude journal file from Time Machine if database is
  excluded.
 
 BUG=74053
@@ -22,7 +22,7 @@ TODO(shess): Revisit this for -wal mode.  http://crbug.com/78507
  5 files changed, 50 insertions(+), 4 deletions(-)
 
 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/Makefile.linux-gcc
-index 6d67ba7..554bf56 100644
+index a1dec21..952e8d1 100644
 --- a/third_party/sqlite/src/Makefile.linux-gcc
 +++ b/third_party/sqlite/src/Makefile.linux-gcc
 @@ -44,7 +44,11 @@ THREADLIB = -lpthread
@@ -38,7 +38,7 @@ index 6d67ba7..554bf56 100644
  #### Leave SQLITE_DEBUG undefined for maximum speed.  Use SQLITE_DEBUG=1
  #    to check for memory leaks.  Use SQLITE_DEBUG=2 to print a log of all
 diff --git a/third_party/sqlite/src/ext/fts3/fts3_porter.c b/third_party/sqlite/src/ext/fts3/fts3_porter.c
-index db175ac..933602a 100644
+index 8fb4c25d..b180ee2 100644
 --- a/third_party/sqlite/src/ext/fts3/fts3_porter.c
 +++ b/third_party/sqlite/src/ext/fts3/fts3_porter.c
 @@ -128,7 +128,7 @@ static int porterClose(sqlite3_tokenizer_cursor *pCursor){
@@ -69,10 +69,10 @@ index db175ac..933602a 100644
    return isConsonant(z + 1);
  }
 diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
-index 4a7ac02..dc56b0d 100644
+index fcc0270..6ff3bd4 100644
 --- a/third_party/sqlite/src/main.mk
 +++ b/third_party/sqlite/src/main.mk
-@@ -591,7 +591,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
+@@ -724,7 +724,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
  testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
  	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
  		$(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c                \
@@ -82,10 +82,10 @@ index 4a7ac02..dc56b0d 100644
  amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
  	$(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
 diff --git a/third_party/sqlite/src/src/pager.c b/third_party/sqlite/src/src/pager.c
-index d840a39..34fa50f 100644
+index 2c904d2..74c76f37 100644
 --- a/third_party/sqlite/src/src/pager.c
 +++ b/third_party/sqlite/src/src/pager.c
-@@ -5467,6 +5467,20 @@ void sqlite3PagerUnref(DbPage *pPg){
+@@ -5497,6 +5497,20 @@ void sqlite3PagerUnref(DbPage *pPg){
    if( pPg ) sqlite3PagerUnrefNotNull(pPg);
  }
  
@@ -106,7 +106,7 @@ index d840a39..34fa50f 100644
  /*
  ** This function is called at the start of every write transaction.
  ** There must already be a RESERVED or EXCLUSIVE lock on the database 
-@@ -5531,6 +5545,24 @@ static int pager_open_journal(Pager *pPager){
+@@ -5561,6 +5575,24 @@ static int pager_open_journal(Pager *pPager){
  #else
            rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0);
  #endif
@@ -132,10 +132,10 @@ index d840a39..34fa50f 100644
        }
        assert( rc!=SQLITE_OK || isOpen(pPager->jfd) );
 diff --git a/third_party/sqlite/src/src/sqliteInt.h b/third_party/sqlite/src/src/sqliteInt.h
-index 63036c5..9d6a7d8 100644
+index c01bbc7..745b910 100644
 --- a/third_party/sqlite/src/src/sqliteInt.h
 +++ b/third_party/sqlite/src/src/sqliteInt.h
-@@ -2985,6 +2985,16 @@ int sqlite3CantopenError(int);
+@@ -3168,6 +3168,16 @@ int sqlite3CantopenError(int);
  #endif
  
  /*
@@ -153,5 +153,5 @@ index 63036c5..9d6a7d8 100644
  ** isspace(), isalnum(), isdigit() and isxdigit(), respectively. The
  ** sqlite versions only work for ASCII characters, regardless of locale.
 -- 
-2.2.1
+2.7.0