bk commit into 5.2 tree (kent:1.2534)

[kent]

Below is the list of changes that have just been committed into a local
5.2 repository of mysqldev. When mysqldev 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@stripped, 2007-07-04 13:15:43+02:00, kent@stripped +1 -0
  configure.in:
    Changed to "5.2.4-alpha"
    Changed previous base version to 5.1

  configure.in@stripped, 2007-07-04 13:13:59+02:00, kent@stripped +2 -2
    Changed to "5.2.4-alpha"
    Changed previous base version to 5.1

# 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:	kent
# Host:	production.mysql.com
# Root:	/data0/mysqldev/my/mysql-5.2

--- 1.360/configure.in	2007-07-04 13:15:54 +02:00
+++ 1.361/configure.in	2007-07-04 13:15:54 +02:00
@@ -9,7 +9,7 @@
 # remember to also update version.c in ndb
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.2.0-alpha)
+AM_INIT_AUTOMAKE(mysql, 5.2.4-alpha)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -26,7 +26,7 @@
 MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION | sed -e 's|[[^0-9.]].*$||;s|$|.|' | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`
 
 # Add previous major version for debian package upgrade path
-MYSQL_PREVIOUS_BASE_VERSION=5.0
+MYSQL_PREVIOUS_BASE_VERSION=5.1
 
 # The port should be constant for a LONG time
 MYSQL_TCP_PORT_DEFAULT=3306