diff options
| author | Dwight <dwight@10gen.com> | 2011-05-03 15:53:27 -0400 |
|---|---|---|
| committer | Dwight <dwight@10gen.com> | 2011-05-03 15:53:27 -0400 |
| commit | a3cd52048a67139bb3ba02357ad5a59948813acd (patch) | |
| tree | 568941a5b6878f90a1920b661b2346245da3055d /s/d_migrate.cpp | |
| parent | 18dc400e68183bb2332d9e5440b939972340a031 (diff) | |
| parent | 4382278e828c312a60fc69f53a7fd6f54845bb89 (diff) | |
| download | mongo-a3cd52048a67139bb3ba02357ad5a59948813acd.tar.gz | |
Merge branch 'master' into main
Conflicts:
SConstruct
db/btree.h
db/db.vcxproj.filters
db/dbcommands_admin.cpp
db/geo/2d.cpp
db/pdfile.cpp
dbtests/test.vcxproj.filters
Diffstat (limited to 's/d_migrate.cpp')
| -rw-r--r-- | s/d_migrate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/s/d_migrate.cpp b/s/d_migrate.cpp index ddc06f50375..c184f2b9c5a 100644 --- a/s/d_migrate.cpp +++ b/s/d_migrate.cpp @@ -431,7 +431,7 @@ namespace mongo { } scoped_ptr<ClientCursor> cc( new ClientCursor( QueryOption_NoCursorTimeout , - shared_ptr<Cursor>( new BtreeCursor( d , d->idxNo(*idx) , *idx , min , max , false , 1 ) ) , + shared_ptr<Cursor>( BtreeCursor::make( d , d->idxNo(*idx) , *idx , min , max , false , 1 ) ) , _ns ) ); // use the average object size to estimate how many objects a full chunk would carry |