mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
BUG#19873 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
into dev3-127.(none):/mnt/mysql/home/ngb/bug19873
This commit is contained in:
commit
169adf9533
1 changed files with 13 additions and 2 deletions
|
@ -1028,6 +1028,12 @@ CommandInterpreter::execute_impl(const char *_line, bool interactive)
|
|||
if (!connect(interactive))
|
||||
DBUG_RETURN(true);
|
||||
|
||||
if (ndb_mgm_check_connection(m_mgmsrv))
|
||||
{
|
||||
disconnect();
|
||||
connect();
|
||||
}
|
||||
|
||||
if (strcasecmp(firstToken, "SHOW") == 0) {
|
||||
Guard g(m_print_mutex);
|
||||
executeShow(allAfterFirstToken);
|
||||
|
@ -1640,11 +1646,16 @@ CommandInterpreter::executeShow(char* parameters)
|
|||
void
|
||||
CommandInterpreter::executeConnect(char* parameters, bool interactive)
|
||||
{
|
||||
BaseString *basestring = NULL;
|
||||
|
||||
disconnect();
|
||||
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;
|
||||
}
|
||||
|
||||
//*****************************************************************************
|
||||
|
|
Loading…
Add table
Reference in a new issue