From: Alexander Nozdrin
Date: June 7 2011 1:08pm
Subject: bzr push into mysql-trunk branch (alexander.nozdrin:3163 to 3164)
List-Archive: http://lists.mysql.com/commits/138781
Message-Id: <201106071308.p57D8QJA004378@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3164 Alexander Nozdrin	2011-06-07 [merge]
      Auto-merge from mysql-5.5.

    modified:
      .bzrignore
 3163 Luis Soares	2011-06-07
      BUG#12626874: ASSERTION WHEN MASTER_POS_WAIT() TAKES RPAD ARGUMENT..
      
      The server was calling DBUG_PRINT with a string got from calling
      String::c_ptr(). However, the correct function to use to get the
      string should be String::c_ptr_safe().

    modified:
      sql/rpl_rli.cc
=== modified file '.bzrignore'
--- a/.bzrignore	2011-05-16 08:52:10 +0000
+++ b/.bzrignore	2011-06-07 13:07:28 +0000
@@ -3160,3 +3160,4 @@ info_macros.cmake
 Docs/INFO_BIN
 Docs/INFO_SRC
 Testing
+source_downloads

No bundle (reason: useless for push emails).