diff options
| author | unknown <ram@mysql.r18.ru> | 2002-12-19 12:38:32 +0400 |
|---|---|---|
| committer | unknown <ram@mysql.r18.ru> | 2002-12-19 12:38:32 +0400 |
| commit | de539bf30adc10a93759729531622dd10ac42155 (patch) | |
| tree | 98eee4f316172c3c9c047e0cdfcf87f3457f927d /bdb/db | |
| parent | 2cae041aa8724c443208693053c488caa5499421 (diff) | |
| download | mariadb-git-de539bf30adc10a93759729531622dd10ac42155.tar.gz | |
patches from sleepycat.com have been applied (SCRUM)
ha_berkeley::rename_table() has been added (SCRUM)
bdb/db/db_open.c:
patches from sleepycat.com have been applied
bdb/log/log_put.c:
patches from sleepycat.com have been applied
bdb/mp/mp_fopen.c:
patches from sleepycat.com have been applied
bdb/rep/rep_record.c:
patches from sleepycat.com have been applied
bdb/txn/txn.c:
patches from sleepycat.com have been applied
sql/ha_berkeley.cc:
ha_berkeley::rename_table() has been added
sql/ha_berkeley.h:
ha_berkeley::rename_table() has been added
Diffstat (limited to 'bdb/db')
| -rw-r--r-- | bdb/db/db_open.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bdb/db/db_open.c b/bdb/db/db_open.c index f6f96cda547..8352525361f 100644 --- a/bdb/db/db_open.c +++ b/bdb/db/db_open.c @@ -536,11 +536,9 @@ swap_retry: * and even a checksum error isn't a reason to panic the environment. */ if ((ret = __db_chk_meta(dbenv, dbp, meta, do_metachk)) != 0) { - if (ret == -1) { + if (ret == -1) __db_err(dbenv, "%s: metadata page checksum error", name); - ret = EINVAL; - } goto bad_format; } @@ -577,7 +575,7 @@ swap_retry: bad_format: __db_err(dbenv, "%s: unexpected file type or format", name); - return (ret); + return (ret == 0 ? EINVAL : ret); } /* |