From: Joerg Bruehe
Date: November 5 2012 11:17am
Subject: bzr push into mysql-trunk branch (joerg.bruehe:4904 to 4905)
List-Archive: http://lists.mysql.com/commits/145134
Message-Id: <20121105111740.1272.66651.4905@trift-6core.fambruehe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4905 Joerg Bruehe	2012-11-05 [merge]
      Version change upmerge - empty

 4904 Kristofer Pettersson	2012-11-05 [merge]
      5.6 =>trunk

    modified:
      mysql-test/r/connect.result
      mysql-test/r/plugin_auth_sha256_tls.result
      mysql-test/t/connect.test
      mysql-test/t/plugin_auth_sha256_tls.test
      sql/sql_yacc.yy
No bundle (reason: useless for push emails).