Skip to content

M
MariaDB
Commit 22c37576 authored by joerg@mysql.com's avatar joerg@mysql.com
Browse files
Options

Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/merge-5.1

parents 8163afb4 2e82e5ae
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
configure.in
View file @ 22c37576
...@@ -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!
# remember to also change ndb version below and update version.c in ndb # remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE(mysql, 5.1.8-beta) AM_INIT_AUTOMAKE(mysql, 5.1.7-beta)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10
......
support-files/mysql.spec.sh
View file @ 22c37576
...@@ -709,7 +709,7 @@ fi ...@@ -709,7 +709,7 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Mon Feb 20 03:04:32 CET 2006 * Mon Feb 20 2006 Kent Boortz <kent@mysql.com>
- Reintroduced a max build - Reintroduced a max build
- Limited testing of 'debug' and 'max' servers - Limited testing of 'debug' and 'max' servers
......
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