aboutsummaryrefslogtreecommitdiff
path: root/src/vdbeaux.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2011-04-05 13:12:28 +0000
committerdrh <drh@noemail.net>2011-04-05 13:12:28 +0000
commit959b6a95ee5f398ce3db3b3199f4e579e621e43c (patch)
tree732ad37cd655bc396a327918c6b60639937e6708 /src/vdbeaux.c
parent8d129422ed9a04bac684864ba127fa6278cc7513 (diff)
parent03faf63b57a76c925c0e46e8bcb3b86cfe098590 (diff)
downloadsqlite-959b6a95ee5f398ce3db3b3199f4e579e621e43c.tar.gz
sqlite-959b6a95ee5f398ce3db3b3199f4e579e621e43c.zip
Merge the scheme-parse-refactor changes into trunk: (1) added
sqlite3SchemaMutexHeld() asserts, (2) Use -1 instead of 0 to mean "all" in sqlite3ResetInternalSchema(), and other cosmetic changes. FossilOrigin-Name: 5db4511d8a77b74be3503a7c34257ef6b07541f5
Diffstat (limited to 'src/vdbeaux.c')
-rw-r--r--src/vdbeaux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index b28bac4f3..7313ad5c3 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2278,7 +2278,7 @@ int sqlite3VdbeHalt(Vdbe *p){
/* Rollback or commit any schema changes that occurred. */
if( p->rc!=SQLITE_OK && db->flags&SQLITE_InternChanges ){
- sqlite3ResetInternalSchema(db, 0);
+ sqlite3ResetInternalSchema(db, -1);
db->flags = (db->flags | SQLITE_InternChanges);
}