Skip to content

M
mariadb
Commit 0f6030b1 authored by unknown's avatar unknown
Browse files
Options

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 

into mysql.com:/M51/mysql-5.1


configure.in:
  Auto merged
parents 5805fd26 40d895d8
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
configure.in
View file @ 0f6030b1
...@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) ...@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line! # The Docs Makefile.am parses this line!
# Don't forget to also update the NDB lines below. # Don't forget to also update the NDB lines below.
AM_INIT_AUTOMAKE(mysql, 5.1.0-alpha) AM_INIT_AUTOMAKE(mysql, 5.1.1-alpha)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
...@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 ...@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0
# ndb version # ndb version
NDB_VERSION_MAJOR=5 NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=1 NDB_VERSION_MINOR=1
NDB_VERSION_BUILD=0 NDB_VERSION_BUILD=1
NDB_VERSION_STATUS="alpha" NDB_VERSION_STATUS="alpha"
# 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 ?
......
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