From: Dmitry Lenev
Date: May 26 2011 3:10pm
Subject: bzr push into mysql-5.5 branch (Dmitry.Lenev:3409 to 3410) Bug#11762012
List-Archive: http://lists.mysql.com/commits/138230
X-Bug: 11762012
Message-Id: <20110526151004.E505E74067D@bandersnatch>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3410 Dmitry Lenev	2011-05-26 [merge]
      Null-merged 5.1 version of fix for bug #11762012 - "54553:
      INNODB ASSERTS IN HA_INNOBASE::UPDATE_ROW, TEMPORARY TABLE,
      TABLE LOCK" into 5.5 tree. 5.5 version of fix will be
      committed and pushed separately.

 3409 Tatjana Azundris Nuernberg	2011-05-26 [merge]
      auto-merge Bug#11745920

    modified:
      include/violite.h
      libmysql/errmsg.c
      mysql-test/r/openssl_1.result
      sql-common/client.c
      sql/sql_acl.cc
      vio/test-ssl.c
      vio/test-sslclient.c
      vio/test-sslserver.c
      vio/viossl.c
      vio/viosslfactories.c
      vio/viotest-ssl.c
No bundle (reason: useless for push emails).