SQLite

Check-in [1cf94a7c41]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Calling sqlite_interrupt() while VACUUM is running should not cause an error. (CVS 1529)
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | version_2
Files: files | file ages | folders
SHA1: 1cf94a7c41b56506251a9964f133e179bd06825f
User & Date: drh 2004-06-04 19:07:54.000
Context
2004-06-09
22:49
Update the version number to 2.8.14. For whatever reason, the version at the tip of the 2.8 branch fixes ticket #757. (CVS 1552) (check-in: 7538d2e529 user: drh tags: version_2)
2004-06-04
19:07
Calling sqlite_interrupt() while VACUUM is running should not cause an error. (CVS 1529) (check-in: 1cf94a7c41 user: drh tags: version_2)
2004-05-10
20:27
Improvements to testing of sqlite_interrupt. More checking for interrupt inside of VACUUM. (CVS 1344) (check-in: d596f513c3 user: drh tags: version_2)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/vacuum.c.
︙︙
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

**
*************************************************************************
** This file contains code used to implement the VACUUM command.
**
** Most of the code in this file may be omitted by defining the
** SQLITE_OMIT_VACUUM macro.
**
** $Id: vacuum.c,v 1.13.2.1 2004/05/10 20:27:41 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"

/*
** A structure for holding a dynamic string - a string that can grow
** without bound. 








|








10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

**
*************************************************************************
** This file contains code used to implement the VACUUM command.
**
** Most of the code in this file may be omitted by defining the
** SQLITE_OMIT_VACUUM macro.
**
** $Id: vacuum.c,v 1.13.2.2 2004/06/04 19:07:54 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"

/*
** A structure for holding a dynamic string - a string that can grow
** without bound.
︙︙
317
318
319
320
321
322
323
324
325
326
327

  }
  if( dbNew ) sqlite_close(dbNew);
  sqliteOsDelete(zTemp);
  sqliteFree(zTemp);
  sqliteFree(sVac.s1.z);
  sqliteFree(sVac.s2.z);
  if( zErrMsg ) sqlite_freemem(zErrMsg);
  if( rc==SQLITE_ABORT && sVac.rc==SQLITE_OK ) sVac.rc = SQLITE_ERROR;
  return sVac.rc;
#endif
}








|




317
318
319
320
321
322
323
324
325
326
327

  }
  if( dbNew ) sqlite_close(dbNew);
  sqliteOsDelete(zTemp);
  sqliteFree(zTemp);
  sqliteFree(sVac.s1.z);
  sqliteFree(sVac.s2.z);
  if( zErrMsg ) sqlite_freemem(zErrMsg);
  if( rc==SQLITE_ABORT && sVac.rc!=SQLITE_INTERRUPT ) sVac.rc = SQLITE_ERROR;
  return sVac.rc;
#endif
}