diff options
author | unknown <lenz@mysql.com> | 2005-05-26 11:43:47 +0200 |
---|---|---|
committer | unknown <lenz@mysql.com> | 2005-05-26 11:43:47 +0200 |
commit | f30b7ed4162c6548304c0e0ecdda510df165951e (patch) | |
tree | 1053945981e5b0eacb2a44cba72cba8006d4b115 /configure.in | |
parent | aa3a934b9d2e7585d9e40a4f56a060bad718baf5 (diff) | |
parent | 1794eb3e2b60494d7f39bde29114b58d2d768165 (diff) | |
download | mariadb-git-f30b7ed4162c6548304c0e0ecdda510df165951e.tar.gz |
- merged the 4.1.12a Changes back into the main tree
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge (corrected version number)
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 7dd49ca8dea..269a1ccc354 100644 --- a/configure.in +++ b/configure.in @@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0 # 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 ? |