Commit 596bf8ec authored by unknown's avatar unknown
Browse files

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154 

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Merge 5.0-ndb into 5.1-ndb


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_debug.h:
  Auto merged
storage/ndb/include/util/Parser.hpp:
  Auto merged
storage/ndb/include/util/socket_io.h:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testMgm.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/drop_tab.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged
storage/ndb/tools/select_count.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged
mysql-test/r/ndb_config.result:
  manual merge
mysql-test/t/ndb_config.test:
  manual merge
storage/ndb/include/util/InputStream.hpp:
  manual merge
storage/ndb/tools/desc.cpp:
  manual merge
storage/ndb/tools/ndb_condig.cpp:
  manual merge
storage/ndb/tools/restore/restore_main.cpp:
  manual merge
storage/ndb/tools/select_all.cpp:
  manual merge
parents d7bb7cc5 dcf21e94

mysql-test/r/ndb_config.result

+4 −0
Original line number Diff line number Diff line
@@ -8,3 +8,7 @@ ndbd,1,localhost,52428800,26214400 ndbd,2,localhost,52428800,36700160 ndbd,3,loc 
ndbd,1,localhost ndbd,2,localhost ndbd,3,localhost ndbd,4,localhost ndb_mgmd,5,localhost mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10,

ndbd,2,localhost ndbd,3,localhost ndbd,4,localhost ndbd,5,localhost ndb_mgmd,6,localhost mysqld,1, mysqld,7, mysqld,8, mysqld,9, mysqld,10,

ndbd,3,localhost ndbd,4,localhost ndbd,5,localhost ndbd,6,localhost ndb_mgmd,1,localhost ndb_mgmd,2,localhost mysqld,11, mysqld,12, mysqld,13, mysqld,14, mysqld,15,

shm,3,4,35,3 shm,3,5,35,3 shm,3,6,35,3 shm,4,5,35,4 shm,4,6,35,4 shm,5,6,35,5 tcp,11,3,55,3 tcp,11,4,55,4 tcp,11,5,55,5 tcp,11,6,55,6 tcp,12,3,55,3 tcp,12,4,55,4 tcp,12,5,55,5 tcp,12,6,55,6 tcp,13,3,55,3 tcp,13,4,55,4 tcp,13,5,55,5 tcp,13,6,55,6 tcp,14,3,55,3 tcp,14,4,55,4 tcp,14,5,55,5 tcp,14,6,55,6 tcp,15,3,55,3 tcp,15,4,55,4 tcp,15,5,55,5 tcp,15,6,55,6 tcp,1,3,55,1 tcp,1,4,55,1 tcp,1,5,55,1 tcp,1,6,55,1 tcp,2,3,55,2 tcp,2,4,55,2 tcp,2,5,55,2 tcp,2,6,55,2

1 2 3



1 2 3

mysql-test/t/ndb_config.test

+6 −0
Original line number Diff line number Diff line
@@ -15,3 +15,9 @@ 
--exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster0 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster1 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --ndb-shm --connections --query=type,nodeid1,nodeid2,group,nodeidserver --mycnf 2> /dev/null





--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --host=localhost --config-file=$NDB_BACKUP_DIR/config.ini 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --host=1.2.3.4   --config-file=$NDB_BACKUP_DIR/config.ini 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --host=127.0.0.1 --config-file=$NDB_BACKUP_DIR/config.ini 2> /dev/null

storage/ndb/include/mgmapi/mgmapi.h

+13 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,19 @@ extern "C" { 
   */

  int ndb_mgm_end_session(NdbMgmHandle handle);



  /**

   * ndb_mgm_get_fd

   *

   * get the file descriptor of the handle.

   * INTERNAL ONLY.

   * USE FOR TESTING. OTHER USES ARE NOT A GOOD IDEA.

   *

   * @param  handle NDB management handle

   * @return handle->socket

   *

   */

  int ndb_mgm_get_fd(NdbMgmHandle handle);



  /**

   * Get the node id of the mgm server we're connected to

   */

storage/ndb/include/mgmapi/mgmapi_debug.h

+14 −0
Original line number Diff line number Diff line
@@ -132,6 +132,20 @@ extern "C" { 
				   const char * value,

				   struct ndb_mgm_reply* reply);



  Uint64 ndb_mgm_get_session_id(NdbMgmHandle handle);



  struct NdbMgmSession {

    Uint64 id;

    Uint32 m_stopSelf;

    Uint32 m_stop;

    Uint32 nodeid;

    Uint32 parser_buffer_len;

    Uint32 parser_status;

  };



  int ndb_mgm_get_session(NdbMgmHandle handle, Uint64 id,

                          struct NdbMgmSession *s, int *len);



#ifdef __cplusplus

}

#endif

storage/ndb/include/util/InputStream.hpp

+10 −1
Original line number Diff line number Diff line
@@ -19,14 +19,22 @@ 


#include <ndb_global.h>

#include <NdbTCP.h>

#include <NdbMutex.h>



/**

 * Input stream

 */

class InputStream {

public:

  virtual ~InputStream() {}

  InputStream() { m_mutex= NULL; };

  virtual ~InputStream() {};

  virtual char* gets(char * buf, int bufLen) = 0;

  /**

   * Set the mutex to be UNLOCKED when blocking (e.g. select(2))

   */

  void set_mutex(NdbMutex *m) { m_mutex= m; };

protected:

  NdbMutex *m_mutex;

};



class FileInputStream : public InputStream {
@@ -42,6 +50,7 @@ extern FileInputStream Stdin; 
class SocketInputStream : public InputStream {

  NDB_SOCKET_TYPE m_socket;

  unsigned m_timeout;

  bool m_startover;

public:

  SocketInputStream(NDB_SOCKET_TYPE socket, unsigned readTimeout = 1000);

  virtual ~SocketInputStream() {}