Commit ceefecb2 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2


configure.in:
  Auto merged
parents 0381f8cf b2490bc2

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.17-beta)

AM_INIT_AUTOMAKE(mysql, 5.2.0-alpha)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

storage/ndb/src/common/util/version.c

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ void ndbSetOwnVersion() {} 


#ifndef TEST_VERSION

struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {

  { MAKE_VERSION(5,2,NDB_VERSION_BUILD), MAKE_VERSION(5,2,0), UG_Range},

  { MAKE_VERSION(5,1,NDB_VERSION_BUILD), MAKE_VERSION(5,1,0), UG_Range},

  { MAKE_VERSION(5,0,NDB_VERSION_BUILD), MAKE_VERSION(5,0,12), UG_Range},

  { MAKE_VERSION(5,0,11), MAKE_VERSION(5,0,2), UG_Range},