Commit 49206d2d authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
parents b6e39434 97682b76

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ jcole@tetra.spaceapes.com 
jimw@mysql.com

joerg@mysql.com

jon@gigan.

jonas@mysql.com

joreland@bk-internal.mysql.com

joreland@mysql.com

jorge@linux.jorge.mysql.com

ndb/examples/Makefile

+7 −2
Original line number Diff line number Diff line 
BIN_DIRS := ndbapi_example1 ndbapi_example3 ndbapi_example4 \

	    ndbapi_example5 ndbapi_scan_example

BIN_DIRS := 	ndbapi_simple_example \

	 	ndbapi_async_example \

	 	ndbapi_async_example1 \

		ndbapi_retries_example \

		ndbapi_simple_index_example \

		ndbapi_event_example \

		ndbapi_scan_example



bins: $(patsubst %, _bins_%, $(BIN_DIRS))

ndb/examples/ndbapi_async_example/ndbapi_async.cpp

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ int populate(Ndb * myNdb, int data, async_callback_t * cbData) 
      }     



      /*Prepare transaction (the transaction is NOT yet sent to NDB)*/

      transaction[current].conn->executeAsynchPrepare(Commit, 

      transaction[current].conn->executeAsynchPrepare(NdbTransaction::Commit, 

						       &callback,

						       cb);

      /**

ndb/examples/ndbapi_example3/Makefile→ndb/examples/ndbapi_async_example1/Makefile

+3 −3
Original line number Diff line number Diff line 
TARGET = ndbapi_example3

SRCS = ndbapi_example3.cpp

OBJS = ndbapi_example3.o

TARGET = ndbapi_async1

SRCS = ndbapi_async1.cpp

OBJS = ndbapi_async1.o

CXX = g++

CFLAGS = -c -Wall -fno-rtti -fno-exceptions

DEBUG =

ndb/examples/ndbapi_example2/ndbapi_example2.cpp→ndb/examples/ndbapi_async_example1/ndbapi_async1.cpp

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



//

//  ndbapi_example2.cpp: Using asynchronous transactions in NDB API

//  ndbapi_async1.cpp: Using asynchronous transactions in NDB API

//

//  Execute ndbapi_example1 to create the table "MYTABLENAME"

//  before executing this program.
@@ -99,7 +99,8 @@ int main() 
    myNdbOperation->setValue("ATTR2", 20 + i);

    

    // Prepare transaction (the transaction is NOT yet sent to NDB)

    myNdbTransaction[i]->executeAsynchPrepare(Commit, &callback, NULL);

    myNdbTransaction[i]->executeAsynchPrepare(NdbTransaction::Commit,

					      &callback, NULL);

  }



  // Send all transactions to NDB