List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:February 22 2006 11:15am
Subject:bk commit into 5.1 tree (joerg:1.2161)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2161 06/02/22 12:15:43 joerg@stripped +1 -0
  Manual fix of the version number when merging the cloned tree.

  configure.in
    1.343 06/02/22 12:15:37 joerg@stripped +1 -1
    Merge of the cloned tree (for its tag and other fix/es) inclueded the reset
    of the version number, this must again be undone in the general tree:
    5.1.8-beta is the current version!

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M51/merge-5.1

--- 1.342/configure.in	2006-02-21 18:24:22 +01:00
+++ 1.343/configure.in	2006-02-22 12:15:37 +01:00
@@ -7,7 +7,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.1.7-beta)
+AM_INIT_AUTOMAKE(mysql, 5.1.8-beta)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
Thread
bk commit into 5.1 tree (joerg:1.2161)Joerg Bruehe22 Feb