Commit 8aaaa8eb authored by unknown's avatar unknown
Browse files

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-bj 

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
parents 57452318 525db89e

There are no changes