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

--===============7079796579944015574==
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
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-utf8.c
=== modified file 'storage/perfschema/pfs_instr.cc'
--- a/storage/perfschema/pfs_instr.cc	2010-03-02 00:10:01 +0000
+++ b/storage/perfschema/pfs_instr.cc	2010-03-05 01:36:54 +0000
@@ -746,6 +746,26 @@ find_or_create_file(PFS_thread *thread,
     }
   }
 
+  char safe_buffer[FN_REFLEN];
+  const char *safe_filename;
+
+  if (len >= FN_REFLEN)
+  {
+    /*
+      The instrumented code uses file names that exceeds FN_REFLEN.
+      This could be legal for instrumentation on non mysys APIs,
+      so we support it.
+      Truncate the file name so that:
+      - it fits into pfs->m_filename
+      - it is safe to use mysys apis to normalize the file name.
+    */
+    memcpy(safe_buffer, filename, FN_REFLEN - 2);
+    safe_buffer[FN_REFLEN - 1]= 0;
+    safe_filename= safe_buffer;
+  }
+  else
+    safe_filename= filename;
+
   /*
     Normalize the file name to avoid duplicates when using aliases:
     - absolute or relative paths
@@ -759,7 +779,7 @@ find_or_create_file(PFS_thread *thread,
     Ignore errors, the file may not exist.
     my_realpath always provide a best effort result in buffer.
   */
-  (void) my_realpath(buffer, filename, MYF(0));
+  (void) my_realpath(buffer, safe_filename, MYF(0));
 
   normalized_filename= buffer;
   normalized_length= strlen(normalized_filename);


--===============7079796579944015574==
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-\
#   51738/
# testament_sha1: 4b257100c661fb8bd6e90e28ac9bfbe86c8e9c89
# timestamp: 2010-03-07 10:30:47 -0700
# base_revision_id: marc.alff@stripped\
#   wef4tek2qxkm3xmb
# 
# Begin bundle
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


--===============7079796579944015574==--