1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#13417440 : 63340: ARCHIVE FILE IO NOT INSTRUMENTED

Browse Source 
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.
This commit is contained in:
Marc Alff 2012-08-24 10:01:59 +02:00
parent 17695cb4ff
commit 9bc328a41a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/perfschema/t/disabled.def
View File

@ -9,4 +9,3 @@
# Do not use any TAB characters for whitespace.
#
##############################################################################
misc : bug#14113704 24/04/2012 Mayank issue reported causing failure.

6
storage/archive/ha_archive.cc
View File

@ -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;