Commit 9daa3b68 authored by John Esmet's avatar John Esmet Committed by Yoni Fogel

refs #5702 fix bad part of a merge


git-svn-id: file:///svn/toku/tokudb@52591 c7de825b-a66e-492c-adef-691d508d4ae1
parent ee52f1de
...@@ -1731,7 +1731,7 @@ static void open_db_for_create(DB *db, int idx, struct cli_args *cli_args) { ...@@ -1731,7 +1731,7 @@ static void open_db_for_create(DB *db, int idx, struct cli_args *cli_args) {
r = db->set_pagesize(db, cli_args->env_args.node_size); CKERR(r); r = db->set_pagesize(db, cli_args->env_args.node_size); CKERR(r);
r = db->set_readpagesize(db, cli_args->env_args.basement_node_size); CKERR(r); r = db->set_readpagesize(db, cli_args->env_args.basement_node_size); CKERR(r);
const int flags = DB_CREATE | (cli_args->blackhole ? DB_BLACKHOLE : 0); const int flags = DB_CREATE | (cli_args->blackhole ? DB_BLACKHOLE : 0);
r = db->open(db, null_txn, name, NULL, DB_BTREE, flags, 0666); CKERR(r); r = db->open(db, null_txn, name, nullptr, DB_BTREE, flags, 0666); CKERR(r);
} }
static void open_db(DB *db, int idx, struct cli_args *cli_args) { static void open_db(DB *db, int idx, struct cli_args *cli_args) {
...@@ -1740,7 +1740,7 @@ static void open_db(DB *db, int idx, struct cli_args *cli_args) { ...@@ -1740,7 +1740,7 @@ static void open_db(DB *db, int idx, struct cli_args *cli_args) {
memset(name, 0, sizeof(name)); memset(name, 0, sizeof(name));
get_ith_table_name(name, sizeof(name), idx); get_ith_table_name(name, sizeof(name), idx);
const int flags = DB_CREATE | (cli_args->blackhole ? DB_BLACKHOLE : 0); const int flags = DB_CREATE | (cli_args->blackhole ? DB_BLACKHOLE : 0);
r = db->open(db, null_txn, name, NULL, DB_BTREE, flags, 0666); CKERR(r); r = db->open(db, null_txn, name, nullptr, DB_BTREE, flags, 0666); CKERR(r);
} }
static int create_tables(DB_ENV **env_res, DB **db_res, int num_DBs, static int create_tables(DB_ENV **env_res, DB **db_res, int num_DBs,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment