[sql] Import SQLite 3.17.0.

third_party/sqlite/patches/0003-Modify-default-VFS-to-support-WebDatabase.patch

Index: third_party/sqlite/patches/0003-Modify-default-VFS-to-support-WebDatabase.patch
diff --git a/third_party/sqlite/patches/0004-Modify-default-VFS-to-support-WebDatabase.patch b/third_party/sqlite/patches/0003-Modify-default-VFS-to-support-WebDatabase.patch
similarity index 86%
rename from third_party/sqlite/patches/0004-Modify-default-VFS-to-support-WebDatabase.patch
rename to third_party/sqlite/patches/0003-Modify-default-VFS-to-support-WebDatabase.patch
index b4b3ade3496acd035f6a6472dbbc25494c123b32..aa016b2286c7398d06fe97ca815efa3f551123d3 100644
--- a/third_party/sqlite/patches/0004-Modify-default-VFS-to-support-WebDatabase.patch
+++ b/third_party/sqlite/patches/0003-Modify-default-VFS-to-support-WebDatabase.patch
@@ -1,7 +1,7 @@
-From 0a5da8cd79a6b502edc01c40037ae418b2d5c828 Mon Sep 17 00:00:00 2001
+From dfb453c3fe580a2e42cdbdb5196273f41563d562 Mon Sep 17 00:00:00 2001
 From: dumi <dumi@chromium.org>
 Date: Mon, 20 Jul 2009 23:40:51 +0000
-Subject: [PATCH 04/10] Modify default VFS to support WebDatabase.
+Subject: [PATCH 03/10] Modify default VFS to support WebDatabase.
 
 The renderer WebDatabase implementation needs to broker certain requests
 to the browser.  This modifies SQLite to allow monkey-patching the VFS
@@ -23,10 +23,10 @@ https://codereview.chromium.org/377039
  3 files changed, 80 insertions(+)
 
 diff --git a/third_party/sqlite/src/src/os_unix.c b/third_party/sqlite/src/src/os_unix.c
-index 791ba5d..fa85638 100644
+index 7f0ebdba6fdf..60981af7e738 100644
 --- a/third_party/sqlite/src/src/os_unix.c
 +++ b/third_party/sqlite/src/src/os_unix.c
-@@ -1297,6 +1297,12 @@ static int fileHasMoved(unixFile *pFile){
+@@ -1346,6 +1346,12 @@ static int fileHasMoved(unixFile *pFile){
    return pFile->pInode!=0 && pFile->pId!=pFile->pInode->fileId.pId;
  #else
    struct stat buf;
@@ -37,9 +37,9 @@ index 791ba5d..fa85638 100644
 +  return 0;
 +
    return pFile->pInode!=0 &&
-       (osStat(pFile->zPath, &buf)!=0 || buf.st_ino!=pFile->pInode->fileId.ino);
- #endif
-@@ -5554,6 +5560,44 @@ static int findCreateFileMode(
+       (osStat(pFile->zPath, &buf)!=0 
+          || (u64)buf.st_ino!=pFile->pInode->fileId.ino);
+@@ -5640,6 +5646,44 @@ static int findCreateFileMode(
  }
  
  /*
@@ -67,7 +67,7 @@ index 791ba5d..fa85638 100644
 +  if( eType==SQLITE_OPEN_MAIN_DB ){
 +    p->pUnused = sqlite3_malloc(sizeof(*p->pUnused));
 +    if (!p->pUnused) {
-+      return SQLITE_NOMEM;
++      return SQLITE_NOMEM_BKPT;

[Scott Hess - ex-Googler, 2017/03/16 00:40:57]

The _BKPT versions are coded so that you can set a debugger breakpoint, then
return the non-_BKPT version.  So this this follows the original code, and
shouldn't change the operation of anything.

 +    }
 +    p->pUnused->fd = fd;
 +    p->pUnused->flags = flags;
@@ -84,7 +84,7 @@ index 791ba5d..fa85638 100644
  ** Open the file zPath.
  ** 
  ** Previously, the SQLite OS layer used three functions in place of this
-@@ -5654,6 +5698,7 @@ static int unixOpen(
+@@ -5740,6 +5784,7 @@ static int unixOpen(
      sqlite3_randomness(0,0);
    }
  
@@ -92,15 +92,15 @@ index 791ba5d..fa85638 100644
    memset(p, 0, sizeof(unixFile));
  
    if( eType==SQLITE_OPEN_MAIN_DB ){
-@@ -5662,6 +5707,7 @@ static int unixOpen(
+@@ -5748,6 +5793,7 @@ static int unixOpen(
      if( pUnused ){
        fd = pUnused->fd;
      }else{
 +      /* Duplicated in chromium_sqlite3_fill_in_unix_sqlite3_file(). */
        pUnused = sqlite3_malloc64(sizeof(*pUnused));
        if( !pUnused ){
-         return SQLITE_NOMEM;
-@@ -5739,6 +5785,7 @@ static int unixOpen(
+         return SQLITE_NOMEM_BKPT;
+@@ -5825,6 +5871,7 @@ static int unixOpen(
    }
  
    if( p->pUnused ){
@@ -108,7 +108,7 @@ index 791ba5d..fa85638 100644
      p->pUnused->fd = fd;
      p->pUnused->flags = flags;
    }
-@@ -5819,10 +5866,12 @@ static int unixOpen(
+@@ -5903,10 +5950,12 @@ static int unixOpen(
    }
  #endif
    
@@ -122,10 +122,10 @@ index 791ba5d..fa85638 100644
    }
    return rc;
 diff --git a/third_party/sqlite/src/src/os_win.c b/third_party/sqlite/src/src/os_win.c
-index c54bfd6..00ad6fd 100644
+index 2cb5f7b0c836..94dcd0e047f9 100644
 --- a/third_party/sqlite/src/src/os_win.c
 +++ b/third_party/sqlite/src/src/os_win.c
-@@ -5639,4 +5639,12 @@ int sqlite3_os_end(void){
+@@ -5960,4 +5960,12 @@ int sqlite3_os_end(void){
    return SQLITE_OK;
  }
  
@@ -139,10 +139,10 @@ index c54bfd6..00ad6fd 100644
 +
  #endif /* SQLITE_OS_WIN */
 diff --git a/third_party/sqlite/src/src/sqlite.h.in b/third_party/sqlite/src/src/sqlite.h.in
-index 59b30cd..e5673fd 100644
+index eaa75fc249e1..fbbf4b9f2db3 100644
 --- a/third_party/sqlite/src/src/sqlite.h.in
 +++ b/third_party/sqlite/src/src/sqlite.h.in
-@@ -7411,6 +7411,29 @@ int sqlite3_strnicmp(const char *, const char *, int);
+@@ -7697,6 +7697,29 @@ int sqlite3_strnicmp(const char *, const char *, int);
  */
  int sqlite3_strglob(const char *zGlob, const char *zStr);
  
@@ -173,5 +173,5 @@ index 59b30cd..e5673fd 100644
  ** CAPI3REF: String LIKE Matching
  *
 -- 
-2.7.0
+2.11.0