database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Five-algorithm conflict resolution appears to be working. (CVS 363)

Browse Source 
FossilOrigin-Name: 0115518f8e4591123582e3d2bb67282111ebcf60
This commit is contained in:
drh
2002-02-03 00:56:09 +00:00
parent 663fc63a77
commit 0d65dc0e90
10 changed files with 678 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vdbe.c
View File

@@ -30,7 +30,7 @@
** But other routines are also provided to help in building up
** a program instruction by instruction.
**
** $Id: vdbe.c,v 1.114 2002/02/02 18:49:21 drh Exp $
** $Id: vdbe.c,v 1.115 2002/02/03 00:56:10 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -4511,10 +4511,9 @@ cleanup:
break;
}
}
}else{
sqliteBtreeCommitCkpt(pBt);
if( db->pBeTemp ) sqliteBtreeCommitCkpt(db->pBeTemp);
}
}
sqliteBtreeCommitCkpt(pBt);
if( db->pBeTemp ) sqliteBtreeCommitCkpt(db->pBeTemp);
return rc;
/* Jump to here if a malloc() fails. It's hard to get a malloc()