List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:January 9 2006 4:26pm
Subject:bk commit into 5.1 tree (joerg:1.2030)
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.2030 06/01/09 17:26:17 joerg@stripped +1 -0
  Version number increase.

  configure.in
    1.331 06/01/09 17:26:11 joerg@stripped +1 -7
    1) Update version, now that 5.1.5 has been cloned.
    2) Get rid of erroneous merge, NDB version is deduced automatically from global 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/mysql-5.1

--- 1.330/configure.in	2005-12-31 10:13:33 +01:00
+++ 1.331/configure.in	2006-01-09 17:26:11 +01:00
@@ -7,19 +7,13 @@
 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.5-alpha)
+AM_INIT_AUTOMAKE(mysql, 5.1.6-alpha)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
 DOT_FRM_VERSION=6
 # See the libtool docs for information on how to do shared lib versions.
 SHARED_LIB_VERSION=15:0:0
-
-# ndb version
-NDB_VERSION_MAJOR=5
-NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=19
-NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4
Thread
bk commit into 5.1 tree (joerg:1.2030)Joerg Bruehe9 Jan