From: Hery Ramilison
Date: January 8 2013 11:47am
Subject: bzr push into mysql-5.1 branch (hery.ramilison:3908 to 3909)
List-Archive: http://lists.mysql.com/commits/145579
Message-Id: <20130108114734.21004.95076.3909@helheim.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3909 hery.ramilison@stripped	2013-01-08
      Raise version number after cloning 5.1.68

    modified:
      configure.in
 3908 Satya Bodapati	2013-01-07 {clone-5.1.68-build}
      Post Fix to Bug#14628410 - ASSERTION `! IS_SET()' FAILED IN
      			    DIAGNOSTICS_AREA::SET_OK_STATUS
      
      Use DBUG_RETURN() instead of return() if DBUG_ENTER() is
      used in the function. This patch is to  fix the Windows 
      pb2 failure on mysql-5.1
      
      Approved by Marko. rb#1792

    modified:
      storage/innodb_plugin/handler/ha_innodb.cc
=== modified file 'configure.in'
--- a/configure.in	2012-11-05 10:05:46 +0000
+++ b/configure.in	2013-01-08 11:42:36 +0000
@@ -12,7 +12,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.68], [], [mysql])
+AC_INIT([MySQL Server], [5.1.69], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

No bundle (reason: useless for push emails).