From: Marc Alff
Date: March 7 2010 5:42pm
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3123)
List-Archive: http://lists.mysql.com/commits/102521
Message-Id: <20100307174230.9540F45E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7589868489451348255=="

--===============7589868489451348255==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3123 Marc Alff	2010-03-07 [merge]
      local merge

    added:
      mysql-test/include/ctype_utf8mb4.inc
      mysql-test/r/ctype_utf8mb4_heap.result
      mysql-test/r/ctype_utf8mb4_innodb.result
      mysql-test/r/ctype_utf8mb4_myisam.result
      mysql-test/r/ctype_utf8mb4_ndb.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/t/pfs_upgrade.test
      mysql-test/suite/sys_vars/r/log_error_func.result
      mysql-test/suite/sys_vars/r/log_error_func2.result
      mysql-test/suite/sys_vars/r/log_error_func3.result
      mysql-test/suite/sys_vars/t/log_error_func.cnf
      mysql-test/suite/sys_vars/t/log_error_func.test
      mysql-test/suite/sys_vars/t/log_error_func2.cnf
      mysql-test/suite/sys_vars/t/log_error_func2.test
      mysql-test/suite/sys_vars/t/log_error_func3.test
      mysql-test/t/ctype_utf8mb4_heap.test
      mysql-test/t/ctype_utf8mb4_innodb.test
      mysql-test/t/ctype_utf8mb4_myisam.test
      mysql-test/t/ctype_utf8mb4_ndb.test
    modified:
      COPYING
      README
      configure.in
      include/m_ctype.h
      mysql-test/collections/default.experimental
      mysql-test/lib/v1/mysql-test-run.pl
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/t/ctype_utf8mb4.test
      scripts/mysql_system_tables.sql
      sql-common/client.c
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/sys_vars.cc
      storage/perfschema/pfs_instr.cc
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-utf8.c
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2010-01-12 01:47:27 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2010-03-05 01:10:27 +0000
@@ -37,14 +37,25 @@ PFS_file* lookup_file_by_name(const char
   uint i;
   PFS_file *pfs;
   uint len= strlen(name);
+  size_t dirlen;
+  const char *filename;
+  uint filename_length;;
 
   for (i= 0; i < file_max; i++)
   {
     pfs= & file_array[i];
     if (pfs->m_lock.is_populated())
     {
-      if ((len == pfs->m_filename_length) &&
-          (strncmp(name, pfs->m_filename, pfs->m_filename_length) == 0))
+      /*
+        When a file "foo" is instrumented, the name is normalized
+        to "/path/to/current/directory/foo", so we remove the
+        directory name here to find it back.
+      */
+      dirlen= dirname_length(pfs->m_filename);
+      filename= pfs->m_filename + dirlen;
+      filename_length= pfs->m_filename_length - dirlen;
+      if ((len == filename_length) &&
+          (strncmp(name, filename, filename_length) == 0))
         return pfs;
     }
   }


--===============7589868489451348255==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-bugfixing-\
#   51741/
# testament_sha1: 61802fc657cddef172a44f973ea3db93c0062aa3
# timestamp: 2010-03-07 10:42:30 -0700
# base_revision_id: marc.alff@stripped\
#   d3ihpafu62c6lb2x
# 
# Begin bundle
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


--===============7589868489451348255==--