bk commit into 4.1 tree (lenz:1.2296)

[lenz]

Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz 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.2296 05/05/26 11:43:47 lenz@stripped +4 -0
  - merged the 4.1.12a Changes back into the main tree

  configure.in
    1.375 05/05/26 11:43:41 lenz@stripped +1 -2
    - manual merge (corrected version number)

  sql/ha_myisammrg.cc
    1.58 05/05/26 11:32:44 lenz@stripped +0 -1
    Auto merged

  mysys/my_getwd.c
    1.16 05/05/26 11:32:44 lenz@stripped +0 -4
    Auto merged

  myisammrg/myrg_open.c
    1.30 05/05/26 11:32:44 lenz@stripped +0 -3
    Auto merged

# 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:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1-build/RESYNC

--- 1.374/configure.in	2005-05-18 04:06:25 +02:00
+++ 1.375/configure.in	2005-05-26 11:43:41 +02:00
@@ -16,7 +16,7 @@
 # ndb version
 NDB_VERSION_MAJOR=4
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=12
+NDB_VERSION_BUILD=13
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?