summaryrefslogtreecommitdiff
path: root/storage/innobase/os
diff options
context:
space:
mode:
authorVasil Dimov <vasil.dimov@oracle.com>2010-09-20 19:00:28 +0300
committerVasil Dimov <vasil.dimov@oracle.com>2010-09-20 19:00:28 +0300
commitac67443afe196426664264c4cbc28737d474dfdb (patch)
treefb543b5d3cdcfc51fe8bbd3681f0725c3deac29e /storage/innobase/os
parentb69c8895c9dbdeba91843b7dcbab71f5bba3d1a1 (diff)
downloadmariadb-git-ac67443afe196426664264c4cbc28737d474dfdb.tar.gz
(os0file.c:1485) Bug#55227 Fix compiler warnings in innodb with gcc 4.6
Diffstat (limited to 'storage/innobase/os')
-rw-r--r--storage/innobase/os/os0file.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c
index a57e10182dd..6c17ded0073 100644
--- a/storage/innobase/os/os0file.c
+++ b/storage/innobase/os/os0file.c
@@ -1482,7 +1482,6 @@ try_again:
int create_flag;
ibool retry;
const char* mode_str = NULL;
- const char* type_str = NULL;
try_again:
ut_a(name);
@@ -1502,14 +1501,7 @@ try_again:
ut_error;
}
- if (type == OS_LOG_FILE) {
- type_str = "LOG";
- } else if (type == OS_DATA_FILE) {
- type_str = "DATA";
- } else {
- ut_error;
- }
-
+ ut_a(type == OS_LOG_FILE || type == OS_DATA_FILE);
ut_a(purpose == OS_FILE_AIO || purpose == OS_FILE_NORMAL);
#ifdef O_SYNC