1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge with trunk.

Browse Source
This commit is contained in:
Chad MILLER 2009-05-11 14:42:43 -04:00
commit a7794c7549
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE(mysql, 5.0.82)
AM_INIT_AUTOMAKE(mysql, 5.0.83)
AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10
@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=0
NDB_VERSION_BUILD=82
NDB_VERSION_BUILD=83
NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ?

2
scripts/make_win_bin_dist
View File

@ -126,7 +126,7 @@ if [ -e $DESTDIR ] ; then
usage
fi
trap 'echo "Clearning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR
trap 'echo "Cleaning up and exiting..." ; rm -fr $DESTDIR; exit 1' ERR
# ----------------------------------------------------------------------
# Adjust target name if needed, release with debug info has another name