From 9bc328a41ae6c7fbdde4167168206dfa9912ece0 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Fri, 24 Aug 2012 10:01:59 +0200 Subject: Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED WARNING This patch is for mysql-5.5 only, to be null-merged to mysql-5.6 and mysql-trunk. This is a partial rollback of the file io instrumentation, removing the instrumentation for mysql_file_stat in the archive engine. See the bug comments for details. --- storage/archive/ha_archive.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'storage/archive') diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 24dbaefce27..0e186cb8513 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -277,7 +277,7 @@ int archive_discover(handlerton *hton, THD* thd, const char *db, build_table_filename(az_file, sizeof(az_file) - 1, db, name, ARZ, 0); - if (!(mysql_file_stat(arch_key_file_data, az_file, &file_stat, MYF(0)))) + if (!(mysql_file_stat(/* arch_key_file_data */ 0, az_file, &file_stat, MYF(0)))) goto err; if (!(azopen(&frm_stream, az_file, O_RDONLY|O_BINARY))) @@ -727,7 +727,7 @@ int ha_archive::create(const char *name, TABLE *table_arg, There is a chance that the file was "discovered". In this case just use whatever file is there. */ - if (!(mysql_file_stat(arch_key_file_data, name_buff, &file_stat, MYF(0)))) + if (!(mysql_file_stat(/* arch_key_file_data */ 0, name_buff, &file_stat, MYF(0)))) { my_errno= 0; if (!(azopen(&create_stream, name_buff, O_CREAT|O_RDWR|O_BINARY))) @@ -1622,7 +1622,7 @@ int ha_archive::info(uint flag) { MY_STAT file_stat; // Stat information for the data file - (void) mysql_file_stat(arch_key_file_data, share->data_file_name, &file_stat, MYF(MY_WME)); + (void) mysql_file_stat(/* arch_key_file_data */ 0, share->data_file_name, &file_stat, MYF(MY_WME)); if (flag & HA_STATUS_TIME) stats.update_time= (ulong) file_stat.st_mtime; -- cgit v1.2.1