# # # patch "ChangeLog" # from [c609155a6c125a258d4d8c585b059f2667705347] # to [052f287a6914a9b74d4155d0eaeb71d322ec732d] # # patch "sqlite/pager.c" # from [adbb27f13ac75cd5bc29a3d84803e0cab1edfa88] # to [b74ebe5aca00ad5f831e19ae17193fe7b83a7ddf] # # patch "sqlite/sqlite3.h" # from [2c4119e974bd9182eb3597fbd6343c5e1c4bcb74] # to [44d8c045175afc3da51063660eab529d9ccbd07a] # ============================================================ --- ChangeLog c609155a6c125a258d4d8c585b059f2667705347 +++ ChangeLog 052f287a6914a9b74d4155d0eaeb71d322ec732d @@ -1,3 +1,7 @@ +2005-12-29 Matthew Gregan
+ + * sqlite/{pager.c,sqlite3.h}: Upgrade to SQLite 3.2.8. + 2005-12-29 Nathaniel Smith * NEWS: Notes on what to write up for 0.25. ============================================================ --- sqlite/pager.c adbb27f13ac75cd5bc29a3d84803e0cab1edfa88 +++ sqlite/pager.c b74ebe5aca00ad5f831e19ae17193fe7b83a7ddf @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.215 2005/09/17 15:20:27 drh Exp $ +** @(#) $Id: pager.c,v 1.215.2.1 2005/12/19 16:29:07 drh Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -2981,7 +2981,7 @@ pPg = pager_lookup(pPager, pgno); pPg->alwaysRollback = 1; - if( pPg && pPg->dirty ){ + if( pPg && pPg->dirty && !pPager->stmtInUse ){ if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSize