bzr push into mysql-trunk-perfschema branch (marc.alff:2944 to 2945)

[Marc Alff]

 2945 Marc Alff	2009-11-06
      Fixed code review comment

    modified:
      sql/rpl_rli.cc
 2944 Marc Alff	2009-11-05
      WL#2360 Performance Schema
      
      Completed the instrumentation for file STAT and FSTAT.

    modified:
      include/mysql/psi/mysql_file.h
      sql/discover.cc
      sql/ha_partition.cc
      sql/handler.cc
      sql/item_strfunc.cc
      sql/log.cc
      sql/parse_file.cc
      sql/rpl_rli.cc
      sql/set_var.cc
      sql/sql_db.cc
      sql/sql_load.cc
      sql/sql_show.cc
      sql/sql_table.cc
      storage/archive/ha_archive.cc
      storage/myisam/mi_info.c
      storage/perfschema/pfs.cc
=== modified file 'sql/rpl_rli.cc'
--- a/sql/rpl_rli.cc	2009-11-06 03:14:41 +0000
+++ b/sql/rpl_rli.cc	2009-11-06 16:25:42 +0000
@@ -326,7 +326,7 @@ static inline int add_relay_log(Relay_lo
 {
   MY_STAT s;
   DBUG_ENTER("add_relay_log");
-  if (!mysql_file_stat(key_file_relay_log_info,
+  if (!mysql_file_stat(key_file_binlog,
                        linfo->log_file_name, &s, MYF(0)))
   {
     sql_print_error("log %s listed in the index, but failed to stat",


Attachment: [text/bzr-bundle] bzr/[e-mail]