bk commit into 6.1 tree (tsmith:1.2544)

[tim]

Below is the list of changes that have just been committed into a local
6.1 repository of tsmith.  When tsmith 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, 2008-02-07 20:02:53+01:00, tsmith@stripped +2 -0
  configure.in, post-commit:
    Update version to 6.1-fk

  BitKeeper/triggers/post-commit@stripped, 2008-02-07 20:02:43+01:00, tsmith@stripped +1 -1
    Update version to 6.1-fk

  configure.in@stripped, 2008-02-07 20:02:43+01:00, tsmith@stripped +1 -1
    Update version to 6.1-fk

diff -Nrup a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
--- a/BitKeeper/triggers/post-commit	2008-01-08 08:56:08 +01:00
+++ b/BitKeeper/triggers/post-commit	2008-02-07 20:02:43 +01:00
@@ -11,7 +11,7 @@ FROM=$COMMITTER@stripped
 COMMITS=commits@stripped
 DOCS=docs-commit@stripped
 LIMIT=10000
-VERSION="6.0"
+VERSION="6.1"
 BKROOT=`bk root`
 
 if [ -x /usr/sbin/sendmail ]; then
diff -Nrup a/configure.in b/configure.in
--- a/configure.in	2008-01-28 18:51:19 +01:00
+++ b/configure.in	2008-02-07 20:02:43 +01:00
@@ -9,7 +9,7 @@ AC_CANONICAL_SYSTEM
 # 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, 6.0.5-alpha)
+AM_INIT_AUTOMAKE(mysql, 6.1.0-fk)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 NDB_VERSION_MAJOR=6