Commit ba2261e3 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 

into flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.1


sql/ha_federated.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
parents 7961b0c4 15ffcb7e

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ magnus@msdesk.mysql.com 
magnus@neptunus.(none)

magnus@shellback.(none)

marko@hundin.mysql.fi

marty@flipper.bredbandsbolaget.se

marty@linux.site

marty@shark.

mats@mysql.com

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

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ void ndbSetOwnVersion() {} 


#ifndef TEST_VERSION

struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {

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

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

  { MAKE_VERSION(5,0,8), MAKE_VERSION(5,0,3), UG_Range},

  { MAKE_VERSION(5,0,3), MAKE_VERSION(5,0,2), UG_Exact },

  { MAKE_VERSION(4,1,12), MAKE_VERSION(4,1,10), UG_Range },

  { MAKE_VERSION(4,1,10), MAKE_VERSION(4,1,9), UG_Exact },