diff options
| -rw-r--r-- | dist/sqlite3.c | 9 | ||||
| -rw-r--r-- | dist/sqlite3.c.orig | 9 | ||||
| -rw-r--r-- | dist/sqlite3.h | 2 | ||||
| -rw-r--r-- | dist/sqlite3.h.orig | 2 | ||||
| -rw-r--r-- | dist/version | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/dist/sqlite3.c b/dist/sqlite3.c index 73d422e..11c954b 100644 --- a/dist/sqlite3.c +++ b/dist/sqlite3.c @@ -633,7 +633,7 @@ extern "C" { */ #define SQLITE_VERSION "3.6.22" #define SQLITE_VERSION_NUMBER 3006022 -#define SQLITE_SOURCE_ID "2010-02-25 14:56:29 b8fbf4275bded6680e368a6a8343866467bd7e22" +#define SQLITE_SOURCE_ID "2010-03-03 00:02:58 e5342234357dcfde33fb7589f87d64f6de7d9970" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -29822,6 +29822,7 @@ SQLITE_PRIVATE void sqlite3PcacheSetPageSize(PCache *pCache, int szPage){ if( pCache->pCache ){ sqlite3GlobalConfig.pcache.xDestroy(pCache->pCache); pCache->pCache = 0; + pCache->pPage1 = 0; } pCache->szPage = szPage; } @@ -85591,7 +85592,11 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ ** time to parse and run the PRAGMA to turn journalling off than it does ** to write the journal header file. */ - zSql = "ATTACH '' AS vacuum_db;"; + if( sqlite3TempInMemory(db) ){ + zSql = "ATTACH ':memory:' AS vacuum_db;"; + }else{ + zSql = "ATTACH '' AS vacuum_db;"; + } rc = execSql(db, pzErrMsg, zSql); if( rc!=SQLITE_OK ) goto end_of_vacuum; pDb = &db->aDb[db->nDb-1]; diff --git a/dist/sqlite3.c.orig b/dist/sqlite3.c.orig index f14e56c..91ec2e3 100644 --- a/dist/sqlite3.c.orig +++ b/dist/sqlite3.c.orig @@ -633,7 +633,7 @@ extern "C" { */ #define SQLITE_VERSION "3.6.22" #define SQLITE_VERSION_NUMBER 3006022 -#define SQLITE_SOURCE_ID "2010-02-25 14:56:29 b8fbf4275bded6680e368a6a8343866467bd7e22" +#define SQLITE_SOURCE_ID "2010-03-03 00:02:58 e5342234357dcfde33fb7589f87d64f6de7d9970" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -29817,6 +29817,7 @@ SQLITE_PRIVATE void sqlite3PcacheSetPageSize(PCache *pCache, int szPage){ if( pCache->pCache ){ sqlite3GlobalConfig.pcache.xDestroy(pCache->pCache); pCache->pCache = 0; + pCache->pPage1 = 0; } pCache->szPage = szPage; } @@ -85586,7 +85587,11 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ ** time to parse and run the PRAGMA to turn journalling off than it does ** to write the journal header file. */ - zSql = "ATTACH '' AS vacuum_db;"; + if( sqlite3TempInMemory(db) ){ + zSql = "ATTACH ':memory:' AS vacuum_db;"; + }else{ + zSql = "ATTACH '' AS vacuum_db;"; + } rc = execSql(db, pzErrMsg, zSql); if( rc!=SQLITE_OK ) goto end_of_vacuum; pDb = &db->aDb[db->nDb-1]; diff --git a/dist/sqlite3.h b/dist/sqlite3.h index b971516..9e5c6e7 100644 --- a/dist/sqlite3.h +++ b/dist/sqlite3.h @@ -109,7 +109,7 @@ extern "C" { */ #define SQLITE_VERSION "3.6.22" #define SQLITE_VERSION_NUMBER 3006022 -#define SQLITE_SOURCE_ID "2010-02-25 14:56:29 b8fbf4275bded6680e368a6a8343866467bd7e22" +#define SQLITE_SOURCE_ID "2010-03-03 00:02:58 e5342234357dcfde33fb7589f87d64f6de7d9970" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/dist/sqlite3.h.orig b/dist/sqlite3.h.orig index ef2ecd9..3343141 100644 --- a/dist/sqlite3.h.orig +++ b/dist/sqlite3.h.orig @@ -109,7 +109,7 @@ extern "C" { */ #define SQLITE_VERSION "3.6.22" #define SQLITE_VERSION_NUMBER 3006022 -#define SQLITE_SOURCE_ID "2010-02-25 14:56:29 b8fbf4275bded6680e368a6a8343866467bd7e22" +#define SQLITE_SOURCE_ID "2010-03-03 00:02:58 e5342234357dcfde33fb7589f87d64f6de7d9970" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/dist/version b/dist/version index 1a8d902..3aae4ce 100644 --- a/dist/version +++ b/dist/version @@ -1,2 +1,2 @@ 3.6.22 Froyo branch http://www.sqlite.org/src/timeline?t=branch-3.6.22 -at checkin http://www.sqlite.org/src/info/b8fbf4275b +at checkin http://www.sqlite.org/src/info/e534223435 |