Commit a8e10dde authored by unknown's avatar unknown
Browse files

Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
parents f63123f5 91548a19

ndb/src/mgmclient/CommandInterpreter.cpp

+416 −92

File changed.

Preview size limit exceeded, changes collapsed.

ndb/src/mgmclient/main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ read_and_execute(int _try_reconnect) 
    line_read= strdup(linebuffer);

  }

#endif

  return com->execute(line_read,_try_reconnect);

  return com->execute(line_read, _try_reconnect, 1);

}



int main(int argc, char** argv){
@@ -163,7 +163,7 @@ int main(int argc, char** argv){ 
  }

  else

  {

    com->execute(opt_execute_str,_try_reconnect, &ret);

    com->execute(opt_execute_str,_try_reconnect, 0, &ret);

  }

  delete com;

ndb/src/mgmclient/ndb_mgmclient.hpp

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ class Ndb_mgmclient 
public:

  Ndb_mgmclient(const char*,int verbose=0);

  ~Ndb_mgmclient();

  int execute(const char *_line, int _try_reconnect=-1, int *error= 0);

  int execute(int argc, char** argv, int _try_reconnect=-1, int *error= 0);

  int execute(const char *_line, int _try_reconnect=-1, bool interactive=1, int *error= 0);

  int execute(int argc, char** argv, int _try_reconnect=-1, bool interactive=1, int *error= 0);

  int disconnect();

private:

  CommandInterpreter *m_cmd;

ndb/src/mgmsrv/ConfigInfo.cpp

+9 −2
Original line number Diff line number Diff line
@@ -2604,6 +2604,13 @@ transformNode(InitConfigFileParser::Context & ctx, const char * data){ 
    return false;

  }



  if(id >= MAX_NODES)

  {

    ctx.reportError("too many nodes configured, only up to %d nodes supported.",

            MAX_NODES);

    return false;

  } 



  // next node id _always_ next numbers after last used id

  ctx.m_userProperties.put("NextNodeId", id+1, true);
@@ -3495,11 +3502,11 @@ sanity_checks(Vector<ConfigInfo::ConfigRuleSection>&sections, 
  Uint32 mgm_nodes = 0;

  Uint32 api_nodes = 0;

  if (!ctx.m_userProperties.get("DB", &db_nodes)) {

    ctx.reportError("At least one database node should be defined in config file");

    ctx.reportError("At least one database node (ndbd) should be defined in config file");

    return false;

  }

  if (!ctx.m_userProperties.get("MGM", &mgm_nodes)) {

    ctx.reportError("At least one management server node should be defined in config file");

    ctx.reportError("At least one management server node (ndb_mgmd) should be defined in config file");

    return false;

  }

  if (!ctx.m_userProperties.get("API", &api_nodes)) {

ndb/src/mgmsrv/MgmtSrvr.cpp

+4 −1
Original line number Diff line number Diff line
@@ -449,7 +449,10 @@ MgmtSrvr::MgmtSrvr(SocketServer *socket_server, 
    // read config locally

    _config= readConfig();

    if (_config == 0) {

      ndbout << "Unable to read config file" << endl;

      if (config_filename != NULL)

        ndbout << "Invalid configuration file: " << config_filename << endl;

      else

        ndbout << "Invalid configuration file" << endl;

      exit(-1);

    }

  }