bzr commit into mysql-trunk branch (marc.alff:3204)

[Marc Alff]

#At file:///Users/malff/BZR_TREE/mysql-trunk-wl4816/ based on revid:alexander.nozdrin@stripped

 3204 Marc Alff	2010-11-15 [merge]
      Merge mysql-trunk --> mysql-trunk-wl4816

    modified:
      configure.in
=== modified file 'configure.in'
--- a/configure.in	2010-11-09 20:10:44 +0000
+++ b/configure.in	2010-11-14 18:06:55 +0000
@@ -27,7 +27,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.6.99-m5], [], [mysql])
+AC_INIT([MySQL Server], [5.6.1-m5], [], [mysql])
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM
 # USTAR format gives us the possibility to store longer path names in

No bundle (reason: revision is a merge).