/ Check-in [60f16838]
Login

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

Overview
Comment:Cherrypick the incremental_vacuum bug fix ([255f1eefa373153942c67b18b]) into the apple-osx 3.6.23 branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx-3623
Files: files | file ages | folders
SHA1: 60f16838ccee05b5070d9640742fcc8da1b12137
User & Date: drh 2010-08-24 01:59:56
Context
2010-08-24
02:10
Cherrypick the R-tree invalid shadow-table big fix of [7f2f71cc9e3c39093f09231f44] into the apple-osx 3.6.23 branch. check-in: 68103d91 user: drh tags: apple-osx-3623
01:59
Cherrypick the incremental_vacuum bug fix ([255f1eefa373153942c67b18b]) into the apple-osx 3.6.23 branch. check-in: 60f16838 user: drh tags: apple-osx-3623
2010-08-17
23:13
Cherrypick the changes for enhancement requests [e090183531fc27474] (use indices on LIKE with no wildcards) and [4711020446da7d93d993] (use nocase index for LIKE even if the column is binary) into the 3.6.23.1 release of the Apple-OSX branch. check-in: 220cca50 user: drh tags: apple-osx-3623
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/btree.c.

4726
4727
4728
4729
4730
4731
4732




4733
4734
4735
4736
4737
4738
4739
        if( rc ){
          goto end_allocate_page;
        }
        if( k==0 ){
          if( !pPrevTrunk ){
            memcpy(&pPage1->aData[32], &pTrunk->aData[0], 4);
          }else{




            memcpy(&pPrevTrunk->aData[0], &pTrunk->aData[0], 4);
          }
        }else{
          /* The trunk page is required by the caller but it contains 
          ** pointers to free-list leaves. The first leaf becomes a trunk
          ** page in this case.
          */







>
>
>
>







4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
        if( rc ){
          goto end_allocate_page;
        }
        if( k==0 ){
          if( !pPrevTrunk ){
            memcpy(&pPage1->aData[32], &pTrunk->aData[0], 4);
          }else{
            rc = sqlite3PagerWrite(pPrevTrunk->pDbPage);
            if( rc!=SQLITE_OK ){
              goto end_allocate_page;
            }
            memcpy(&pPrevTrunk->aData[0], &pTrunk->aData[0], 4);
          }
        }else{
          /* The trunk page is required by the caller but it contains 
          ** pointers to free-list leaves. The first leaf becomes a trunk
          ** page in this case.
          */

Added test/tkt-5e10420e8d.test.





















































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
# 2010 August 23
#
# The author disclaims copyright to this source code.  In place of
# a legal notice, here is a blessing:
#
#    May you do good and not evil.
#    May you find forgiveness for yourself and forgive others.
#    May you share freely, never taking more than you give.
#
#***********************************************************************
#

set testdir [file dirname $argv0]
source $testdir/tester.tcl

do_test tkt-5e10420e8d.1 {
  db eval {
    PRAGMA page_size = 1024;
    PRAGMA auto_vacuum = incremental;
  
    CREATE TABLE t1(x);
    CREATE TABLE t2(x);
    CREATE TABLE t3(x);
  }
} {}

do_test tkt-5e10420e8d.2 {
  db eval {
    INSERT INTO t3 VALUES(randomblob(500 + 1024*248));
    INSERT INTO t1 VALUES(randomblob(1500));
    INSERT INTO t2 VALUES(randomblob(500 + 1024*248));
  
    DELETE FROM t3;
    DELETE FROM t2;
    DELETE FROM t1;
  }
} {}

do_test tkt-5e10420e8d.3 {
  db eval {
    PRAGMA incremental_vacuum(248)
  }
} {}

do_test tkt-5e10420e8d.4 {
  db eval {
    PRAGMA incremental_vacuum(1)
  }
} {}

db close
sqlite3 db test.db

do_test tkt-5e10420e8d.5 {
  db eval {PRAGMA integrity_check;}
} {ok}

finish_test