summaryrefslogtreecommitdiff
path: root/storage/archive
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-09-23 15:21:29 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-09-23 15:21:29 +0200
commit6a89842e3642729fbac20a92a1655452f4d45487 (patch)
treebe24d592bff31a5a07c28cb307d81ed4f01b925a /storage/archive
parentd49913877064778d8301c7bbd610238b3f5422cd (diff)
downloadmariadb-git-6a89842e3642729fbac20a92a1655452f4d45487.tar.gz
Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2 Cleaning up warnings not present in 5.0.
Diffstat (limited to 'storage/archive')
-rw-r--r--storage/archive/ha_archive.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index 981814628f9..6fa8333c1b7 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -522,8 +522,8 @@ int ha_archive::open(const char *name, int mode, uint open_options)
{
DBUG_RETURN(0);
}
- else
- DBUG_RETURN(rc);
+
+ DBUG_RETURN(rc);
}
@@ -1575,10 +1575,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);
}
/*