database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-18 10:21:03 +03:00
Code Activity

Fix a race condition that can occur when reloading the database schema in shared-cache mode. (CVS 4643)

Browse Source 
FossilOrigin-Name: b37babef913fcceae7f0bd461a3105e184518d62
This commit is contained in:
danielk1977
2007-12-27 15:12:16 +00:00
parent 641b0f4ffa
commit 4eab8b7b41
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/attach.c
View File

@@ -11,7 +11,7 @@
*************************************************************************
** This file contains code used to implement the ATTACH and DETACH commands.
**
** $Id: attach.c,v 1.63 2007/10/03 08:46:44 danielk1977 Exp $
** $Id: attach.c,v 1.64 2007/12/27 15:12:17 danielk1977 Exp $
*/
#include "sqliteInt.h"
@@ -187,7 +187,9 @@ static void attachFunc(
*/
if( rc==SQLITE_OK ){
sqlite3SafetyOn(db);
sqlite3BtreeEnterAll(db);
rc = sqlite3Init(db, &zErrDyn);
sqlite3BtreeLeaveAll(db);
sqlite3SafetyOff(db);
}
if( rc ){

9
src/build.c
View File

@@ -22,7 +22,7 @@
** COMMIT
** ROLLBACK
**
** $Id: build.c,v 1.450 2007/12/04 16:54:53 drh Exp $
** $Id: build.c,v 1.451 2007/12/27 15:12:17 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -403,17 +403,22 @@ void sqlite3UnlinkAndDeleteIndex(sqlite3 *db, int iDb, const char *zIdxName){
*/
void sqlite3ResetInternalSchema(sqlite3 *db, int iDb){
int i, j;
assert( iDb>=0 && iDb<db->nDb );
if( iDb==0 ){
sqlite3BtreeEnterAll(db);
}
for(i=iDb; i<db->nDb; i++){
Db *pDb = &db->aDb[i];
if( pDb->pSchema ){
assert(i==1 || (pDb->pBt && sqlite3BtreeHoldsMutex(pDb->pBt)));
sqlite3SchemaFree(pDb->pSchema);
}
if( iDb>0 ) return;
}
assert( iDb==0 );
db->flags &= ~SQLITE_InternChanges;
sqlite3BtreeLeaveAll(db);
/* If one or more of the auxiliary database files has been closed,
** then remove them from the auxiliary database list. We take the

3
src/prepare.c
View File

@@ -13,7 +13,7 @@
** interface, and routines that contribute to loading the database schema
** from disk.
**
** $Id: prepare.c,v 1.67 2007/12/18 17:50:33 drh Exp $
** $Id: prepare.c,v 1.68 2007/12/27 15:12:17 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -158,6 +158,7 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
assert( iDb>=0 && iDb<db->nDb );
assert( db->aDb[iDb].pSchema );
assert( sqlite3_mutex_held(db->mutex) );
assert( iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) );
/* zMasterSchema and zInitScript are set to point at the master schema
** and initialisation script appropriate for the database being