Auto-merge from mysql-next-mr.

0e9de2ff · Alexander Nozdrin · 75252316 · b7e6249c · 0e9de2ff · 0e9de2ff
Commit 0e9de2ff authored Nov 12, 2009 by Alexander Nozdrin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.bzr-mysql/default.conf .bzr-mysql/default.conf +1 -1

configure.in configure.in +1 -1

No files found.
--- a/.bzr-mysql/default.conf
+++ b/.bzr-mysql/default.conf
 [MYSQL]
 post_commit_to = "commits@lists.mysql.com"
 post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-5.5-next-mr-bugfixing"
+tree_name = "mysql-5.6-next-mr-bugfixing"
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in client/mysqlbinlog.cc:check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.5.0-beta)
+AM_INIT_AUTOMAKE(mysql, 5.6.0-beta)
 AM_CONFIG_HEADER([include/config.h:config.h.in])

 PROTOCOL_VERSION=10