aboutsummaryrefslogtreecommitdiff
path: root/src/btree.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2015-04-15 14:14:38 +0000
committerdrh <drh@noemail.net>2015-04-15 14:14:38 +0000
commitff363ee1217d79e8988a16ef0d72e5ee1729dc48 (patch)
treead4bf050eb315f2742224500d564bb8918458bf5 /src/btree.c
parentdf3c171881b4ee77003b9d7e287220c22dbc97a2 (diff)
parent0d01ec8de83b4e0d7523d67c5f92a44f0ba79b8e (diff)
downloadsqlite-ff363ee1217d79e8988a16ef0d72e5ee1729dc48.tar.gz
sqlite-ff363ee1217d79e8988a16ef0d72e5ee1729dc48.zip
Merge all recent trunk fixes and enhancements into the sessions branch.
FossilOrigin-Name: e65e65f9bc9b4bf5c9dd6e3a77a0d5f03c40e006
Diffstat (limited to 'src/btree.c')
-rw-r--r--src/btree.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/btree.c b/src/btree.c
index 789796d55..9faf62423 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -6735,7 +6735,6 @@ static int balance_nonroot(
}else if( iParentIdx==i ){
nxDiv = i-2+bBulk;
}else{
- assert( bBulk==0 );
nxDiv = iParentIdx-1;
}
i = 2-bBulk;