mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +01:00
upgrade-test-2.c:32: warning: ‘r’ may be used uninitialized in this function
git-svn-id: file:///svn/toku/tokudb@20800 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
parent
383e896608
commit
01755d03e1
2 changed files with 8 additions and 1 deletions
|
@ -20,6 +20,7 @@ enum { old_default_cachesize=1024 }; // MB
|
||||||
int CACHESIZE=old_default_cachesize;
|
int CACHESIZE=old_default_cachesize;
|
||||||
int ALLOW_DUPS=0;
|
int ALLOW_DUPS=0;
|
||||||
enum {MAGIC=311};
|
enum {MAGIC=311};
|
||||||
|
char *datadir = NULL;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Functions to create unique key/value pairs, row generators, checkers, ... for each of NUM_DBS
|
// Functions to create unique key/value pairs, row generators, checkers, ... for each of NUM_DBS
|
||||||
|
@ -344,6 +345,9 @@ static void run_test(void)
|
||||||
r = env->set_default_dup_compare(env, uint_dbt_cmp); CKERR(r);
|
r = env->set_default_dup_compare(env, uint_dbt_cmp); CKERR(r);
|
||||||
if ( verbose ) printf("CACHESIZE = %d MB\n", CACHESIZE);
|
if ( verbose ) printf("CACHESIZE = %d MB\n", CACHESIZE);
|
||||||
r = env->set_cachesize(env, CACHESIZE / 1024, (CACHESIZE % 1024)*1024*1024, 1); CKERR(r);
|
r = env->set_cachesize(env, CACHESIZE / 1024, (CACHESIZE % 1024)*1024*1024, 1); CKERR(r);
|
||||||
|
if (datadir) {
|
||||||
|
r = env->set_data_dir(env, datadir); CKERR(r);
|
||||||
|
}
|
||||||
r = env->set_generate_row_callback_for_put(env, put_multiple_generate);
|
r = env->set_generate_row_callback_for_put(env, put_multiple_generate);
|
||||||
CKERR(r);
|
CKERR(r);
|
||||||
int envflags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_CREATE | DB_PRIVATE;
|
int envflags = DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN | DB_CREATE | DB_PRIVATE;
|
||||||
|
@ -472,6 +476,9 @@ static void do_args(int argc, char * const argv[]) {
|
||||||
bomb_after_poll_count = strtoll(argv[0], &end, 10);
|
bomb_after_poll_count = strtoll(argv[0], &end, 10);
|
||||||
assert(errno==0);
|
assert(errno==0);
|
||||||
assert(*end==0); // make sure we consumed the whole integer.
|
assert(*end==0); // make sure we consumed the whole integer.
|
||||||
|
} else if (strcmp(argv[0], "--datadir") == 0 && argc > 1) {
|
||||||
|
argc--; argv++;
|
||||||
|
datadir = argv[0];
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "Unknown arg: %s\n", argv[0]);
|
fprintf(stderr, "Unknown arg: %s\n", argv[0]);
|
||||||
resultcode=1;
|
resultcode=1;
|
||||||
|
|
|
@ -29,7 +29,7 @@ char *env_dir = ENVDIR; // the default env_dir.
|
||||||
int SRC_VERSION = 4;
|
int SRC_VERSION = 4;
|
||||||
|
|
||||||
static void upgrade_test_2(DB **dbs) {
|
static void upgrade_test_2(DB **dbs) {
|
||||||
int r;
|
int r = 0;
|
||||||
// open the DBS
|
// open the DBS
|
||||||
{
|
{
|
||||||
DBT desc;
|
DBT desc;
|
||||||
|
|
Loading…
Add table
Reference in a new issue