unknown f6a65b0206 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51 ...

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

2006-06-22 19:48:04 +02:00

..

bank

disabled.def cleanup

2006-04-21 17:28:45 +02:00

bench

ndb-wl2325.patch

2005-09-15 11:33:50 +02:00

acid2.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

acid.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

adoInsertRecs.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

asyncGenerator.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

benchronja.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

bulk_copy.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

cdrserver.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

celloDb.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

create_all_tabs.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

create_tab.cpp

Import ndb varsize

2005-11-07 12:19:28 +01:00

drop_all_tabs.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

flex_bench_mysql.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

flexAsynch.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

flexBench.cpp

Import ndb varsize

2005-11-07 12:19:28 +01:00

flexHammer.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

flexScan.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

flexTimedAsynch.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

flexTT.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

index2.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

index.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

initronja.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

InsertRecs.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

interpreterInTup.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

mainAsyncGenerator.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

Makefile.am

Merge mysql.com:/home/jimw/my/mysql-5.0-clean

2006-05-19 19:07:33 -07:00

msa.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndb_async1.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndb_async2.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndb_user_populate.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndb_user_transaction2.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndb_user_transaction3.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndb_user_transaction4.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndb_user_transaction5.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndb_user_transaction6.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndb_user_transaction.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

restarter2.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

restarter.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

restarts.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ScanFilter.hpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ScanFunctions.hpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ScanInterpretTest.hpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

size.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

slow_select.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

test_event_merge.cpp

ndb - bug#18102: fixes on NDB API level

2006-06-21 16:15:04 +02:00

test_event_multi_table.cpp

ndb-wl2325.patch

2005-09-15 11:33:50 +02:00

test_event.cpp

ndb - bug#19872 fix (sufficient for replication)

2006-06-12 18:00:06 +02:00

testBackup.cpp

WL#2868 Fix backup trigger handling

2006-01-20 15:42:00 +11:00

testBasic.cpp

ndb -

2006-05-31 08:22:54 +02:00

testBasicAsynch.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

testBitfield.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

testBlobs.cpp

Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285

2006-06-17 11:10:43 +02:00

testDataBuffers.cpp

Merge perch.ndb.mysql.com:/home/jonas/src/50-work

2006-01-13 09:22:02 +01:00

testDeadlock.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

testDict.cpp

ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come)

2006-06-22 19:26:15 +02:00

testGrepVerify.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

testIndex.cpp

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

2005-04-26 19:07:13 -07:00

testInterpreter.cpp

Merge mysql.com:/home/jimw/my/mysql-5.0-clean

2006-05-19 19:07:33 -07:00

testLcp.cpp

Import ndb varsize

2005-11-07 12:19:28 +01:00

testMgm.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

testNdbApi.cpp

wl2723 - ndb opt. nr

2006-01-11 11:35:25 +01:00

testNodeRestart.cpp

ndb - bug#20185

2006-06-02 15:54:09 +02:00

testOIBasic.cpp

Import ndb varsize

2005-11-07 12:19:28 +01:00

testOperations.cpp

ndb - bug#19293 and family

2006-05-18 10:17:53 +02:00

testOrderedIndex.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

testPartitioning.cpp

Import ndb varsize

2005-11-07 12:19:28 +01:00

testReadPerf.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

testRestartGci.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

testScan.cpp

ndb -

2006-05-19 16:29:48 +02:00

testScanInterpreter.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

testScanPerf.cpp

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

2005-05-02 13:19:50 +02:00

testSRBank.cpp

ndb test

2006-03-04 08:26:27 +01:00

testSystemRestart.cpp

Merge perch.ndb.mysql.com:/home/jonas/src/50-work

2006-03-24 07:43:55 +01:00

testTimeout.cpp

Merge perch.ndb.mysql.com:/home/jonas/src/50-work

2006-03-24 07:43:55 +01:00

testTransactions.cpp

wl2723 - ndb opt. nr

2006-01-11 11:35:25 +01:00

TraceNdbApi.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

userInterface.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

VerifyNdbApi.cpp

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00