From: Nirbhay Choubey
Date: October 10 2012 12:25pm
Subject: bzr push into mysql-trunk branch (nirbhay.choubey:4698 to 4699) Bug#14722862
List-Archive: http://lists.mysql.com/commits/145000
X-Bug: 14722862
Message-Id: <20121010122507.29747.91953.4699@Nirbhay-lenovo>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4699 Nirbhay Choubey	2012-10-10 [merge]
      Merge of patch for bug#14722862 from mysql-5.6.

    modified:
      tests/mysql_client_fw.c
 4698 Joerg Bruehe	2012-10-10 [merge]
      Merge the #12794345 fix upwards into trunk.

    added:
      scripts/mysql_security_commands.sql
    modified:
      cmake/info_macros.cmake.in
      scripts/CMakeLists.txt
      scripts/mysql_install_db.pl.in
      support-files/mysql.spec.sh
=== modified file 'tests/mysql_client_fw.c'
--- a/tests/mysql_client_fw.c	2012-07-26 18:46:34 +0000
+++ b/tests/mysql_client_fw.c	2012-10-10 12:21:38 +0000
@@ -212,8 +212,8 @@ static void print_error(MYSQL *l_mysql,
  {
    if (l_mysql && mysql_errno(l_mysql))
    {
-     if (mysql->server_version)
-     fprintf(stdout, "\n [MySQL-%s]", mysql->server_version);
+     if (l_mysql->server_version)
+     fprintf(stdout, "\n [MySQL-%s]", l_mysql->server_version);
      else
      fprintf(stdout, "\n [MySQL]");
      fprintf(stdout, "[%d] %s\n", mysql_errno(l_mysql), mysql_error(l_mysql));

No bundle (reason: useless for push emails).