diff options
| author | unknown <lenz@mysql.com> | 2005-06-01 15:11:14 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-06-01 15:11:14 +0200 |
| commit | 29fb604ddf9477142a1a1ca044d37572921f5799 (patch) | |
| tree | e1aefa8a0b44cfe02ff518c8f5a95210aef9dd02 /configure.in | |
| parent | bac98672ee5e325c91a2b2f5f7a3126d4362ba10 (diff) | |
| parent | 853a55ad215db4f44bee4281de57054bf2f7da17 (diff) | |
| download | mariadb-git-29fb604ddf9477142a1a1ca044d37572921f5799.tar.gz | |
Merge of 4.1 -> 5.0
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/client/mysqltest.dsp:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/strings/strings.dsp:
Auto merged
VC++Files/strings/strings_ia64.dsp:
Auto merged
include/config-win.h:
Auto merged
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge, fixed NDB_VERSION_BUILD
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 332b851402d..936e4ed22e1 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ SHARED_LIB_VERSION=14:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=6 +NDB_VERSION_BUILD=7 NDB_VERSION_STATUS="beta" # Set all version vars based on $VERSION. How do we do this more elegant ? @@ -1195,16 +1195,10 @@ EOF # echo -n "making sure specific build files are writable... " for file in \ - Docs/include.texi \ Docs/mysql.info \ - Docs/manual.txt \ - Docs/manual_toc.html \ - Docs/manual.html \ Docs/INSTALL-BINARY \ INSTALL-SOURCE \ - COPYING \ - COPYING.LIB \ - MIRRORS + COPYING do if test -e $file; then chmod +w $file |