Commit be733ad1 authored by unknown's avatar unknown
Browse files

fixed error in test result 

    added extra calls to retrieve connectstring used
    reengineered connect somewhat to make retries etc explicit


mysql-test/r/ndb_index_unique.result:
  fixed error in test result
ndb/include/mgmapi/mgmapi.h:
  added extra calls to retrieve connectstring used
ndb/include/mgmcommon/ConfigRetriever.hpp:
  added extra calls to retrieve connectstring used
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  added extra calls to retrieve connectstring used
ndb/src/mgmapi/mgmapi.cpp:
  added extra calls to retrieve connectstring used
ndb/src/mgmclient/CommandInterpreter.cpp:
  moved parse of quit to avoid connect before
ndb/src/ndbapi/Ndbinit.cpp:
  reengineered connect somewhat to make retries etc explicit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
ndb/tools/listTables.cpp:
  reengineered connect somewhat to make retries etc explicit
sql/ha_ndbcluster.cc:
  added extra calls to retrieve connectstring used
  reengineered connect somewhat to make retries etc explicit
parent 99e69f26

mysql-test/r/ndb_index_unique.result

+2 −0
Original line number Diff line number Diff line
@@ -77,8 +77,10 @@ a b c 
3	NULL	NULL

select * from t1 use index (bc) where b IS NULL and c IS NULL order by a;

a	b	c

3	NULL	NULL

select * from t1 use index (bc) where b IS NULL and c = 2 order by a;

a	b	c

2	NULL	2

select * from t1 use index (bc) where b < 4 order by a;

a	b	c

1	1	1

ndb/include/mgmapi/mgmapi.h

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ extern "C" { 
  int ndb_mgm_get_configuration_nodeid(NdbMgmHandle handle);

  int ndb_mgm_get_connected_port(NdbMgmHandle handle);

  const char *ndb_mgm_get_connected_host(NdbMgmHandle handle);

  const char *ndb_mgm_get_connectstring(NdbMgmHandle handle, char *buf, int buf_sz);



  /**

   * Destroy a management server handle

ndb/include/mgmcommon/ConfigRetriever.hpp

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public: 


  Uint32 get_mgmd_port() const;

  const char *get_mgmd_host() const;

  const char *get_connectstring(char *buf, int buf_sz) const;



  Uint32 get_configuration_nodeid() const;

private:

ndb/include/ndbapi/ndb_cluster_connection.hpp

+4 −2
Original line number Diff line number Diff line
@@ -30,12 +30,14 @@ class Ndb_cluster_connection { 
public:

  Ndb_cluster_connection(const char * connect_string = 0);

  ~Ndb_cluster_connection();

  int connect(int reconnect= 0);

  int connect(int no_retries, int retry_delay_in_seconds, int verbose);

  int start_connect_thread(int (*connect_callback)(void)= 0);

  const char *get_connectstring(char *buf, int buf_sz) const;

  int get_connected_port() const;

  const char *get_connected_host() const;

private:

  friend void* run_ndb_cluster_connection_connect_thread(void*);

  void connect_thread();

  char *m_connect_string;

  TransporterFacade *m_facade;

  ConfigRetriever *m_config_retriever;

  NdbThread *m_connect_thread;

ndb/src/common/mgmcommon/ConfigRetriever.cpp

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ const char *ConfigRetriever::get_mgmd_host() const 
  return ndb_mgm_get_connected_host(m_handle);

}



const char *ConfigRetriever::get_connectstring(char *buf, int buf_sz) const

{

  return ndb_mgm_get_connectstring(m_handle, buf, buf_sz);

}



//****************************************************************************

//****************************************************************************