Commit 169adf95 authored by gni/root@dev3-127.(none)'s avatar gni/root@dev3-127.(none)

BUG#19873 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj

into  dev3-127.(none):/mnt/mysql/home/ngb/bug19873
parents 0a3778c0 28954111
...@@ -1028,6 +1028,12 @@ CommandInterpreter::execute_impl(const char *_line, bool interactive) ...@@ -1028,6 +1028,12 @@ CommandInterpreter::execute_impl(const char *_line, bool interactive)
if (!connect(interactive)) if (!connect(interactive))
DBUG_RETURN(true); DBUG_RETURN(true);
if (ndb_mgm_check_connection(m_mgmsrv))
{
disconnect();
connect();
}
if (strcasecmp(firstToken, "SHOW") == 0) { if (strcasecmp(firstToken, "SHOW") == 0) {
Guard g(m_print_mutex); Guard g(m_print_mutex);
executeShow(allAfterFirstToken); executeShow(allAfterFirstToken);
...@@ -1640,11 +1646,16 @@ CommandInterpreter::executeShow(char* parameters) ...@@ -1640,11 +1646,16 @@ CommandInterpreter::executeShow(char* parameters)
void void
CommandInterpreter::executeConnect(char* parameters, bool interactive) CommandInterpreter::executeConnect(char* parameters, bool interactive)
{ {
BaseString *basestring = NULL;
disconnect(); disconnect();
if (!emptyString(parameters)) { if (!emptyString(parameters)) {
m_constr= BaseString(parameters).trim().c_str(); basestring= new BaseString(parameters);
m_constr= basestring->trim().c_str();
} }
connect(interactive); connect();
if (basestring != NULL)
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