bzr push into mysql-5.0-bugteam branch (joro:2847 to 2848)

[Georgi Kodinov]

 2848 Georgi Kodinov	2009-11-20 [merge]
      merge

    modified:
      configure.in
 2847 Georgi Kodinov	2009-11-18
      Bug#48864: MySQL fails to compile on 64 bit Fedora 12
      
      Fixed 2 errors in comp_err executable : 
      1. Wrong (off by 1) length passed to my_checksum()
      2. strmov() was used on overlapping strings. This is
       not legal according to the docs in stpcpy(). Used 
      the overlap safe memmove() instead.

    modified:
      extra/comp_err.c
=== modified file 'configure.in'
--- a/configure.in	2009-10-27 13:11:06 +0000
+++ b/configure.in	2009-11-09 18:22:35 +0000
@@ -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.0.88)
+AM_INIT_AUTOMAKE(mysql, 5.0.89)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_M
 # ndb version
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=88
+NDB_VERSION_BUILD=89
 NDB_VERSION_STATUS=""
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?


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