diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-13 13:42:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-13 13:42:38 +0400 |
| commit | c69629d269fcab948800a427eff587b68cd7cf34 (patch) | |
| tree | e56ffd06670e5f719dc7c91ca477eb50aa578a24 /storage/archive/ha_archive.cc | |
| parent | eddd727a3a3de0e27e921551263e18c0b558a8ca (diff) | |
| parent | 85bb4aa09ee906c5cb8a3f7af8ff319e3a6c93b9 (diff) | |
| download | mariadb-git-c69629d269fcab948800a427eff587b68cd7cf34.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'storage/archive/ha_archive.cc')
| -rw-r--r-- | storage/archive/ha_archive.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index cfa5a721a97..bdad3e42e44 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -523,8 +523,8 @@ int ha_archive::open(const char *name, int mode, uint open_options) { DBUG_RETURN(0); } - else - DBUG_RETURN(rc); + + DBUG_RETURN(rc); } @@ -1598,10 +1598,8 @@ int ha_archive::check(THD* thd, HA_CHECK_OPT* check_opt) share->crashed= FALSE; DBUG_RETURN(HA_ADMIN_CORRUPT); } - else - { - DBUG_RETURN(HA_ADMIN_OK); - } + + DBUG_RETURN(HA_ADMIN_OK); } /* |