database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-21 08:47:42 +03:00
Code Activity

Merge dev3-127.(none):/mnt/mysql/home/ngb/bug19873

Browse Source 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19873


include/config-netware.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/ut/ut0dbg.c:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
This commit is contained in:
unknown
2006-08-29 13:43:04 +08:00
parent 52ac50b37b 49d46e0cc0
commit 06733a24bb
20 changed files with 81 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
storage/ndb/src/mgmclient/CommandInterpreter.cpp
View File

@@ -964,6 +964,12 @@ CommandInterpreter::execute_impl(const char *_line, bool interactive)
if (!connect(interactive))
DBUG_RETURN(true);
if (ndb_mgm_check_connection(m_mgmsrv))
{
disconnect();
connect(interactive);
}
if (strcasecmp(firstToken, "SHOW") == 0) {
Guard g(m_print_mutex);
executeShow(allAfterFirstToken);
@@ -1567,11 +1573,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);
if (basestring != NULL)
delete basestring;
}
//*****************************************************************************