Commit daf98f12 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/test/run-test/main.cpp:
  Auto merged
parents 1c5364be f8aca318

ndb/src/cw/cpcd/APIService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ ParserRow<CPCDAPISession> commands[] = 
    CPCD_ARG("stderr", String, Optional,  "Redirection of stderr"),

    CPCD_ARG("stdin",  String, Optional,  "Redirection of stderr"),

    CPCD_ARG("ulimit", String, Optional,  "ulimit"),

    CPCD_ARG("shutdown", String, Optional,  "shutdown options"),  



  CPCD_CMD("undefine process", &CPCDAPISession::undefineProcess, ""),

    CPCD_CMD_ALIAS("undef", "undefine process", 0),

ndb/src/cw/cpcd/CPCD.hpp

+6 −0
Original line number Diff line number Diff line
@@ -243,6 +243,12 @@ public: 
     * @desc Format c:unlimited d:0 ...

     */

    BaseString m_ulimit;



    /**

     * @brief shutdown options

     */

    BaseString m_shutdown_options;



  private:

    class CPCD *m_cpcd;

    void do_exec();

ndb/src/cw/cpcd/Process.cpp

+8 −1
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ CPCD::Process::print(FILE * f){ 
  fprintf(f, "stdout: %s\n", m_stdout.c_str() ? m_stdout.c_str() : "");

  fprintf(f, "stderr: %s\n", m_stderr.c_str() ? m_stderr.c_str() : "");

  fprintf(f, "ulimit: %s\n", m_ulimit.c_str() ? m_ulimit.c_str() : "");

  fprintf(f, "shutdown: %s\n", m_shutdown_options.c_str() ? 

	  m_shutdown_options.c_str() : "");

}



CPCD::Process::Process(const Properties & props, class CPCD *cpcd) {
@@ -64,6 +66,7 @@ CPCD::Process::Process(const Properties & props, class CPCD *cpcd) { 
  props.get("stdout", m_stdout);

  props.get("stderr", m_stderr);

  props.get("ulimit", m_ulimit);

  props.get("shutdown", m_shutdown_options);

  m_status = STOPPED;



  if(strcasecmp(m_type.c_str(), "temporary") == 0){
@@ -451,7 +454,11 @@ CPCD::Process::stop() { 
  m_status = STOPPING;

  

  errno = 0;

  int ret = kill(-m_pid, SIGTERM);

  int signo= SIGTERM;

  if(m_shutdown_options == "SIGKILL")

    signo= SIGKILL;



  int ret = kill(-m_pid, signo);

  switch(ret) {

  case 0:

    logger.debug("Sent SIGTERM to pid %d", (int)-m_pid);

ndb/test/include/CpcClient.hpp

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public: 
    BaseString m_stdout;

    BaseString m_stderr;

    BaseString m_ulimit;

    BaseString m_shutdown_options;

  };



private:

ndb/test/run-test/conf-daily-basic-dl145a.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ baseport: 16000 
basedir: /space/autotest

mgm: CHOOSE_host1

ndb: CHOOSE_host2 CHOOSE_host3 

api: CHOOSE_host1 CHOOSE_host1 CHOOSE_hosts1

api: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1

-- cluster config

[DB DEFAULT]

NoOfReplicas: 2