(os0file.c:1486) Bug#55227 Fix compiler warnings in innodb with gcc 4.6

This commit is contained in:
Vasil Dimov 2010-09-20 18:57:36 +03:00
parent fb1338558d
commit 4883683668

View file

@ -1483,7 +1483,6 @@ try_again:
ibool retry; ibool retry;
const char* mode_str = NULL; const char* mode_str = NULL;
const char* type_str = NULL; const char* type_str = NULL;
const char* purpose_str = NULL;
try_again: try_again:
ut_a(name); ut_a(name);
@ -1511,18 +1510,8 @@ try_again:
ut_error; ut_error;
} }
if (purpose == OS_FILE_AIO) { ut_a(purpose == OS_FILE_AIO || purpose == OS_FILE_NORMAL);
purpose_str = "AIO";
} else if (purpose == OS_FILE_NORMAL) {
purpose_str = "NORMAL";
} else {
ut_error;
}
#if 0
fprintf(stderr, "Opening file %s, mode %s, type %s, purpose %s\n",
name, mode_str, type_str, purpose_str);
#endif
#ifdef O_SYNC #ifdef O_SYNC
/* We let O_SYNC only affect log files; note that we map O_DSYNC to /* We let O_SYNC only affect log files; note that we map O_DSYNC to
O_SYNC because the datasync options seemed to corrupt files in 2001 O_SYNC because the datasync options seemed to corrupt files in 2001