From: Marc Alff
Date: October 12 2012 7:28pm
Subject: bzr push into mysql-5.6 branch (marc.alff:4449 to 4450)
List-Archive: http://lists.mysql.com/commits/145032
Message-Id: <201210121928.q9CJSPGU032742@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4450 Marc Alff	2012-10-12
      Fixed review comment

    modified:
      storage/perfschema/pfs_instr.cc
 4449 Marc Alff	2012-10-12 [merge]
      Local merge

    modified:
      VERSION
      scripts/mysql_secure_installation.pl.in
      scripts/mysql_secure_installation.sh
      sql/item_func.h
      sql/log_event.cc
      sql/sql_cache.cc
=== modified file 'storage/perfschema/pfs_instr.cc'
--- a/storage/perfschema/pfs_instr.cc	2012-10-10 12:28:24 +0000
+++ b/storage/perfschema/pfs_instr.cc	2012-10-12 19:27:31 +0000
@@ -797,7 +797,7 @@ void PFS_thread::reset_session_connect_a
       (session_connect_attrs_size_per_thread > 0) )
   {
     /* Do not keep user data */
-    memset(m_session_connect_attrs, session_connect_attrs_size_per_thread, 0);
+    memset(m_session_connect_attrs, 0, session_connect_attrs_size_per_thread);
   }
 }
 

No bundle (reason: useless for push emails).