Commit b358c5cb authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/space/pekka/ndb/version/my51
parents 32944ad2 0953c40f

storage/ndb/include/ndbapi/NdbEventOperation.hpp

+2 −4
Original line number Diff line number Diff line
@@ -94,11 +94,9 @@ public: 
   */

  State getState();

  /**

   * By default events on same NdbEventOperation within same GCI

   * are merged into a single event.  This can be changed with

   * separateEvents(true).

   * See NdbDictionary::Event.  Default is false.

   */

  void separateEvents(bool flag);

  void mergeEvents(bool flag);



  /**

   * Activates the NdbEventOperation to start receiving events. The

storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int myCreateEvent(Ndb* myNdb, 
int main(int argc, char** argv)

{

  ndb_init();

  bool sep = argc > 1 && strcmp(argv[1], "-s") == 0;

  bool merge_events = argc > 1 && strcmp(argv[1], "-m") == 0;



  Ndb_cluster_connection *cluster_connection=

    new Ndb_cluster_connection(); // Object representing the cluster
@@ -157,7 +157,7 @@ int main(int argc, char** argv) 
    printf("create EventOperation\n");

    if ((op = myNdb->createEventOperation(eventName)) == NULL)

      APIERROR(myNdb->getNdbError());

    op->separateEvents(sep);

    op->mergeEvents(merge_events);



    printf("get values\n");

    NdbRecAttr* recAttr[noEventColumnName];

storage/ndb/src/ndbapi/NdbEventOperation.cpp

+2 −2
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ NdbEventOperation::State NdbEventOperation::getState() 
  return m_impl.getState();

}



void NdbEventOperation::separateEvents(bool flag)

void NdbEventOperation::mergeEvents(bool flag)

{

  m_impl.m_separateEvents = flag;

  m_impl.m_mergeEvents = flag;

}



NdbRecAttr *

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ NdbEventOperationImpl::NdbEventOperationImpl(NdbEventOperation &N, 


  m_state= EO_CREATED;



  m_separateEvents = true;

  m_mergeEvents = false;



  m_has_error= 0;
@@ -1168,7 +1168,7 @@ NdbEventBuffer::insertDataL(NdbEventOperationImpl *op, 
    }



    bool use_hash =

      ! op->m_separateEvents &&

      op->m_mergeEvents &&

      sdata->operation < NdbDictionary::Event::_TE_FIRST_NON_DATA_EVENT;



    // find position in bucket hash table

storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ public: 
  Uint32 m_eventId;

  Uint32 m_oid;



  bool m_separateEvents;

  bool m_mergeEvents;

  

  EventBufData *m_data_item;