Commit c74ffabe authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  merge
parents e963a7cd 675f55a6

storage/ndb/include/kernel/GlobalSignalNumbers.h

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
/* 68 not unused */

/* 69 not unused */

/* 70 unused */

#define GSN_UPDATE_FRAG_DIST_KEY_ORD    70

#define GSN_ACC_ABORTREQ                71

#define GSN_ACC_CHECK_SCAN              72

#define GSN_ACC_COMMITCONF              73

storage/ndb/include/kernel/signaldata/CopyFrag.hpp

+12 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class CopyFragReq { 
   */

  friend class Dblqh;

public:

  STATIC_CONST( SignalLength = 8 );

  STATIC_CONST( SignalLength = 9 );



private:

  Uint32 userPtr;
@@ -41,6 +41,8 @@ private: 
  Uint32 schemaVersion;

  Uint32 distributionKey;

  Uint32 gci;

  Uint32 nodeCount;

  Uint32 nodeList[1];

};



class CopyFragConf {
@@ -85,4 +87,13 @@ private: 
  Uint32 errorCode;

};



struct UpdateFragDistKeyOrd

{

  Uint32 tableId;

  Uint32 fragId;

  Uint32 fragDistributionKey;



  STATIC_CONST( SignalLength = 3 );

};



#endif

storage/ndb/include/mgmapi/mgmapi.h

+12 −1
Original line number Diff line number Diff line
@@ -230,6 +230,8 @@ extern "C" { 
    NDB_MGM_SERVER_NOT_CONNECTED = 1010,

    /** Could not connect to socker */

    NDB_MGM_COULD_NOT_CONNECT_TO_SOCKET = 1011,

    /** Could not bind local address */

    NDB_MGM_BIND_ADDRESS = 1012,

    

    /* Alloc node id failures */

    /** Generic error, retry may succeed */
@@ -514,6 +516,15 @@ extern "C" { 
  const char *ndb_mgm_get_connected_host(NdbMgmHandle handle);

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



  /**

   * Set local bindaddress

   * @param arg - Srting of form "host[:port]"

   * @note must be called before connect

   * @note Error on binding local address will not be reported until connect

   * @return 0 on success

   */

  int ndb_mgm_set_bindaddress(NdbMgmHandle, const char * arg);



  /**

   * Gets the connectstring used for a connection

   *

storage/ndb/include/mgmcommon/ConfigRetriever.hpp

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ 
class ConfigRetriever {

public:

  ConfigRetriever(const char * _connect_string,

		  Uint32 version, Uint32 nodeType);

		  Uint32 version, Uint32 nodeType,

		  const char * _bind_address = 0);

  ~ConfigRetriever();



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

storage/ndb/include/ndb_version.h.in

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ char ndb_version_string_buf[NDB_VERSION_STRING_BUF_SZ]; 
#define NDBD_DICT_LOCK_VERSION_5 MAKE_VERSION(5,0,23)

#define NDBD_DICT_LOCK_VERSION_5_1 MAKE_VERSION(5,1,12)



#define NDBD_UPDATE_FRAG_DIST_KEY_50 MAKE_VERSION(5,0,26)

#define NDBD_UPDATE_FRAG_DIST_KEY_51 MAKE_VERSION(5,1,12)



#define NDBD_QMGR_SINGLEUSER_VERSION_5 MAKE_VERSION(5,0,25)

#endif