diff options
| author | dan <dan@noemail.net> | 2020-07-13 18:04:27 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2020-07-13 18:04:27 +0000 |
| commit | a7f82d9f47ca75a2f47dc14f8a8deb6730d718d0 (patch) | |
| tree | e2000d1d8b1b14297c1a8790c65dd90c4a20e2b9 /ext/misc/scrub.c | |
| parent | 7465787b97a0a09841e343630a07ba80f1399e4a (diff) | |
| parent | 5b107654e965973e68c88f90a09a3cc53bac9d8b (diff) | |
| download | sqlite-a7f82d9f47ca75a2f47dc14f8a8deb6730d718d0.tar.gz sqlite-a7f82d9f47ca75a2f47dc14f8a8deb6730d718d0.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 5ee3c27e20d12a126fb773b428bb864102b949a5b26a8d5c523753dcedf4be10
Diffstat (limited to 'ext/misc/scrub.c')
| -rw-r--r-- | ext/misc/scrub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/misc/scrub.c b/ext/misc/scrub.c index 4eb56b0fc..9fbf2aed4 100644 --- a/ext/misc/scrub.c +++ b/ext/misc/scrub.c @@ -166,7 +166,7 @@ static void scrubBackupOpenSrc(ScrubState *p){ sqlite3_errmsg(p->dbSrc)); return; } - p->rcErr = sqlite3_exec(p->dbSrc, "SELECT 1 FROM sqlite_master; BEGIN;", + p->rcErr = sqlite3_exec(p->dbSrc, "SELECT 1 FROM sqlite_schema; BEGIN;", 0, 0, 0); if( p->rcErr ){ scrubBackupErr(p, @@ -535,7 +535,7 @@ int sqlite3_scrub_backup( /* Copy all of the btrees */ scrubBackupBtree(&s, 1, 0); pStmt = scrubBackupPrepare(&s, s.dbSrc, - "SELECT rootpage FROM sqlite_master WHERE coalesce(rootpage,0)>0"); + "SELECT rootpage FROM sqlite_schema WHERE coalesce(rootpage,0)>0"); if( pStmt==0 ) goto scrub_abort; while( sqlite3_step(pStmt)==SQLITE_ROW ){ i = (u32)sqlite3_column_int(pStmt, 0); |