bzr push into mysql-5.5 branch (joerg:3087 to 3088)

[Joerg Bruehe]

 3088 Joerg Bruehe	2010-09-02
      Check the build mechanisms: Do they support a "-rc" suffix?

    modified:
      configure.in
 3087 Alexander Nozdrin	2010-08-31
      Cherry-picking patch for Bug#55846.
      Original changeset:
      ------------------------------------------------------------
      revno: 3186
      revision-id: davi.arnaut@stripped
      parent: gshchepa@stripped
      committer: Davi Arnaut <davi.arnaut@stripped>
      branch nick: mysql-5.5-merge
      timestamp: Tue 2010-08-31 11:28:22 -0300
      message:
        Bug#55846: Link tests fail on Windows - my_compiler.h missing
        
        Make the my_compiler.h header, like my_attribute.h, part of
        the distribution. This is required due to the dependency of
        the former on the latter (which can undefine __attribute__).
      ------------------------------------------------------------

    modified:
      include/CMakeLists.txt
      include/Makefile.am
      scripts/make_win_bin_dist
=== modified file 'configure.in'
--- a/configure.in	2010-08-25 10:22:34 +0000
+++ b/configure.in	2010-09-02 15:44:25 +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.5.6-m3], [], [mysql])
+AC_INIT([MySQL Server], [5.5.6-rc], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM


Attachment: [text/bzr-bundle] bzr/[e-mail]