merge from ndb-5.0-ndb and ndb-5.0-ndb-bj

parent 169adf95
...@@ -1031,7 +1031,7 @@ CommandInterpreter::execute_impl(const char *_line, bool interactive) ...@@ -1031,7 +1031,7 @@ CommandInterpreter::execute_impl(const char *_line, bool interactive)
if (ndb_mgm_check_connection(m_mgmsrv)) if (ndb_mgm_check_connection(m_mgmsrv))
{ {
disconnect(); disconnect();
connect(); connect(interactive);
} }
if (strcasecmp(firstToken, "SHOW") == 0) { if (strcasecmp(firstToken, "SHOW") == 0) {
...@@ -1653,7 +1653,7 @@ CommandInterpreter::executeConnect(char* parameters, bool interactive) ...@@ -1653,7 +1653,7 @@ CommandInterpreter::executeConnect(char* parameters, bool interactive)
basestring= new BaseString(parameters); basestring= new BaseString(parameters);
m_constr= basestring->trim().c_str(); m_constr= basestring->trim().c_str();
} }
connect(); connect(interactive);
if (basestring != NULL) if (basestring != NULL)
delete basestring; delete basestring;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment