diff options
| author | dan <dan@noemail.net> | 2015-02-23 16:17:46 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-02-23 16:17:46 +0000 |
| commit | bbd0c46e0ed724f33bd49b090d433698fbf4acd7 (patch) | |
| tree | 0dd926a08d42415679e26bc704df8d7df8611131 /src/attach.c | |
| parent | 04f121c18771f994abba1c46c6c56cbf38e0aca3 (diff) | |
| parent | d4ef026ebb87b2d4504b73ce08cde8da2a849b9e (diff) | |
| download | sqlite-bbd0c46e0ed724f33bd49b090d433698fbf4acd7.tar.gz sqlite-bbd0c46e0ed724f33bd49b090d433698fbf4acd7.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: e5ca79d2d3c066252b0baa4f76ddbe0ee3b14cb6
Diffstat (limited to 'src/attach.c')
| -rw-r--r-- | src/attach.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/attach.c b/src/attach.c index de8742938..7e35fa67c 100644 --- a/src/attach.c +++ b/src/attach.c @@ -191,7 +191,7 @@ static void attachFunc( case SQLITE_NULL: /* No key specified. Use the key from the main database */ sqlite3CodecGetKey(db, 0, (void**)&zKey, &nKey); - if( nKey>0 || sqlite3BtreeGetReserve(db->aDb[0].pBt)>0 ){ + if( nKey>0 || sqlite3BtreeGetOptimalReserve(db->aDb[0].pBt)>0 ){ rc = sqlite3CodecAttach(db, db->nDb-1, zKey, nKey); } break; |