database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00
Code Activity

Bugfix for previous checkin. (CVS 1587)

Browse Source 
FossilOrigin-Name: 2737505f28e37627ed6091e356d005624e1f49fa
This commit is contained in:
danielk1977
2004-06-14 09:41:17 +00:00
parent 962398d395
commit 3fe83ac7a1
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Ensure\smaster\sjournal\sfile\sis\sdeleted\swhen\sa\stransaction\sis\scommitted.\s(CVS\s1586)
D 2004-06-14T09:35:17
C Bugfix\sfor\sprevious\scheckin.\s(CVS\s1587)
D 2004-06-14T09:41:18
F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@ -75,12 +75,12 @@ F src/vdbe.c e6b6702fb2c2e2702e312f52c2cc08353c580736
F src/vdbe.h 46f74444a213129bc4b5ce40124dd8ed613b0cde
F src/vdbeInt.h ffc7b8ed911c5bf804796a768fdb6f0568010fa2
F src/vdbeapi.c ee350b552fc4c1c695b760f914f69e9c5556e829
F src/vdbeaux.c 71f78da2fa03782ff1e1e8a6c0cb9515476dcc63
F src/vdbeaux.c 79b0dc52fc950c6e66c6259504796350ea5c5964
F src/vdbemem.c 34f59988831ea032b7f526c2c73175f9f4c0f3ad
F src/where.c 7fee7aeb9278f27324f228c55ab453b5f183b486
F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
F test/attach.test aed659e52635662bcd5069599aaca823533edf5a
F test/attach2.test e05d729cb0caba21cfd22f31514e4c5a8fb5ca46
F test/attach2.test 579d6cb94cb944e0d87a2bf8d6696e2036847e6a
F test/attach3.test 8259ab833b5dcdf4acd75d9653f42f703ce2e013
F test/auth.test 95809b8f6a9bec18b94d28cafd03fe27d2f8a9e9
F test/bigfile.test 5b079dfe7354a6c43b92a3ea5e49e4e5d88c789e
@ -223,7 +223,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248
F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
P 80c299f8839d920c61854f575498340b28db98d7
R 2a26bd56f402531968f23465e08b6082
P cb3cbe00be9a42e974688016a056053cedb55eef
R 837b917ea55d1682247e8b038a972e40
U danielk1977
Z 8b29c6d3832661f7081a99e40be4ebed
Z 76731c0455af5162b7baf7a2c3fcabe1

2
manifest.uuid
View File

@ -1 +1 @@
cb3cbe00be9a42e974688016a056053cedb55eef
2737505f28e37627ed6091e356d005624e1f49fa

4
src/vdbeaux.c
View File

@ -1114,8 +1114,6 @@ static int vdbeCommit(sqlite *db){
}
}
sqlite3OsClose(&master);
sqliteFree(zMaster);
zMaster = 0;
/* Delete the master journal file. This commits the transaction. After
** doing this the directory is synced again before any individual
@ -1123,6 +1121,8 @@ static int vdbeCommit(sqlite *db){
*/
rc = sqlite3OsDelete(zMaster);
assert( rc==SQLITE_OK );
sqliteFree(zMaster);
zMaster = 0;
rc = sqlite3OsSyncDirectory(zMainFile);
if( rc!=SQLITE_OK ){
/* This is not good. The master journal file has been deleted, but

7
test/attach2.test
View File

@ -12,7 +12,7 @@
# focus of this script is testing the ATTACH and DETACH commands
# and related functionality.
#
# $Id: attach2.test,v 1.17 2004/06/14 09:35:17 danielk1977 Exp $
# $Id: attach2.test,v 1.18 2004/06/14 09:41:18 danielk1977 Exp $
#
set testdir [file dirname $argv0]
@ -304,8 +304,6 @@ db close
db2 close
file delete -force test2.db
if 0 {
# These tests - attach2-5.* - check that the master journal file is deleted
# correctly when a multi-file transaction is committed or rolled back.
#
@ -343,9 +341,6 @@ do_test attach2-5.5 {
db close
}
finish_test