Commit eeca9375 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/set_var.cc:
  Auto merged
parents f57d5412 1ffdb9e8

ndb/include/ndbapi/NdbIndexScanOperation.hpp

+3 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public: 
   * Reset bounds and put operation in list that will be

   *   sent on next execute

   */

  int reset_bounds();

  int reset_bounds(bool forceSend = false);

  

  bool getSorted() const { return m_ordered; }

private:
@@ -127,8 +127,8 @@ private: 
  virtual NdbRecAttr* getValue_impl(const NdbColumnImpl*, char*);



  void fix_get_values();

  int next_result_ordered(bool fetchAllowed);

  int send_next_scan_ordered(Uint32 idx);

  int next_result_ordered(bool fetchAllowed, bool forceSend = false);

  int send_next_scan_ordered(Uint32 idx, bool forceSend = false);

  int compare(Uint32 key, Uint32 cols, const NdbReceiver*, const NdbReceiver*);



  Uint32 m_sort_columns;

ndb/include/ndbapi/NdbResultSet.hpp

+3 −3
Original line number Diff line number Diff line
@@ -89,17 +89,17 @@ public: 
   * -   1: if there are no more tuples to scan.

   * -   2: if there are no more cached records in NdbApi

   */

  int nextResult(bool fetchAllowed = true);

  int nextResult(bool fetchAllowed = true, bool forceSend = false);



  /**

   * Close result set (scan)

   */

  void close();

  void close(bool forceSend = false);



  /**

   * Restart

   */

  int restart();

  int restart(bool forceSend = false);

  

  /**

   * Transfer scan operation to an updating transaction. Use this function

ndb/include/ndbapi/NdbScanOperation.hpp

+6 −5
Original line number Diff line number Diff line
@@ -90,11 +90,11 @@ protected: 
  NdbScanOperation(Ndb* aNdb);

  virtual ~NdbScanOperation();



  int nextResult(bool fetchAllowed = true);

  int nextResult(bool fetchAllowed = true, bool forceSend = false);

  virtual void release();

  

  void closeScan();

  int close_impl(class TransporterFacade*);

  void closeScan(bool forceSend = false);

  int close_impl(class TransporterFacade*, bool forceSend = false);



  // Overloaded methods from NdbCursorOperation

  int executeCursor(int ProcessorId);
@@ -103,6 +103,7 @@ protected: 
  int init(const NdbTableImpl* tab, NdbConnection* myConnection);

  int prepareSend(Uint32  TC_ConnectPtr, Uint64  TransactionId);

  int doSend(int ProcessorId);

  void checkForceSend(bool forceSend);



  virtual void setErrorCode(int aErrorCode);

  virtual void setErrorCodeAbort(int aErrorCode);
@@ -138,7 +139,7 @@ protected: 
  Uint32 m_sent_receivers_count;  // NOTE needs mutex to access

  NdbReceiver** m_sent_receivers; // receive thread puts them here

  

  int send_next_scan(Uint32 cnt, bool close);

  int send_next_scan(Uint32 cnt, bool close, bool forceSend = false);

  void receiver_delivered(NdbReceiver*);

  void receiver_completed(NdbReceiver*);

  void execCLOSE_SCAN_REP();
@@ -148,7 +149,7 @@ protected: 
  

  Uint32 m_ordered;



  int restart();

  int restart(bool forceSend = false);

};



inline

ndb/include/util/ndb_opts.h

+12 −6
Original line number Diff line number Diff line
@@ -32,10 +32,13 @@ 
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \

  { "version", 'V', "Output version information and exit.", 0, 0, 0, \

    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \

  { "connect-string", 'c', \

  { "ndb-connectstring", 'c', \

    "Set connect string for connecting to ndb_mgmd. " \

    "<constr>=\"host=<hostname:port>[;nodeid=<id>]\". " \

    "Overides specifying entries in NDB_CONNECTSTRING and config file", \

    "Syntax: \"[nodeid=<id>;][host=]<hostname>[:<port>]\". " \

    "Overides specifying entries in NDB_CONNECTSTRING and Ndb.cfg", \

    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0, \

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\

  { "connect-string", 'c', "same as --ndb-connectstring",\

    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0, \

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }

#else
@@ -46,10 +49,13 @@ 
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \

  { "version", 'V', "Output version information and exit.", 0, 0, 0, \

    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, \

  { "connect-string", 'c', \

  { "ndb-connectstring", 'c', \

    "Set connect string for connecting to ndb_mgmd. " \

    "<constr>=\"host=<hostname:port>[;nodeid=<id>]\". " \

    "Overides specifying entries in NDB_CONNECTSTRING and config file", \

    "Syntax: \"[nodeid=<id>;][host=]<hostname>[:<port>]\". " \

    "Overides specifying entries in NDB_CONNECTSTRING and Ndb.cfg", \

    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0, \

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },\

  { "connect-string", 'c', "same as --ndb-connectstring",\

    (gptr*) &opt_connect_str, (gptr*) &opt_connect_str, 0,\

    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }

#endif

ndb/src/kernel/vm/Configuration.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
bool

Configuration::init(int argc, char** argv)

{  

  const char *load_default_groups[]= { "ndbd",0 };

  const char *load_default_groups[]= { "mysql_cluster","ndbd",0 };

  load_defaults("my",load_default_groups,&argc,&argv);



  int ho_error;