Skip to content

M
MariaDB
Commit 4afd2054 authored by gluh@mysql.com/gluh.(none)'s avatar gluh@mysql.com/gluh.(none)
Browse files
Options

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/gluh/MySQL/Merge/5.0
parents a3300c39 b6071f06
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
configure.in
View file @ 4afd2054
...@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 ...@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
# ndb version # ndb version
NDB_VERSION_MAJOR=5 NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=0 NDB_VERSION_MINOR=0
NDB_VERSION_BUILD=25 NDB_VERSION_BUILD=26
NDB_VERSION_STATUS="" NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ? # Set all version vars based on $VERSION. How do we do this more elegant ?
...@@ -2826,8 +2826,9 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl ...@@ -2826,8 +2826,9 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
include/mysql_version.h dnl include/mysql_version.h dnl
cmd-line-utils/Makefile dnl cmd-line-utils/Makefile dnl
cmd-line-utils/libedit/Makefile dnl cmd-line-utils/libedit/Makefile dnl
win/Makefile dnl
zlib/Makefile dnl zlib/Makefile dnl
cmd-line-utils/readline/Makefile win/Makefile) cmd-line-utils/readline/Makefile)
AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
AC_OUTPUT AC_OUTPUT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7