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

258bace3 · unknown · f6ee9735 · df2c7f07 · 258bace3 · 258bace3
Commit 258bace3 authored Feb 22, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

configure.in configure.in +1 -1

support-files/mysql.spec.sh support-files/mysql.spec.sh +1 -1

No files found.
--- a/configure.in
+++ b/configure.in
@@ -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.1.8-beta)
+AM_INIT_AUTOMAKE(mysql, 5.1.7-beta)
 AM_CONFIG_HEADER(config.h)

 PROTOCOL_VERSION=10

--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -709,7 +709,7 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
-* Mon Feb 20 03:04:32 CET 2006
+* Mon Feb 20 2006 Kent Boortz <kent@mysql.com>

 - Reintroduced a max build
 - Limited testing of 'debug' and 'max' servers