mariadb/storage
unknown 2b1df53702 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-12-01 11:32:52 +01:00
..
archive Varchar hack to clean strings removed. 2006-11-28 18:30:41 -08:00
blackhole Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 2006-10-18 18:51:39 +10:00
csv Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location. 2006-11-19 18:01:54 -08:00
example Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location. 2006-11-19 18:01:54 -08:00
federated Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-11-28 22:22:52 +01:00
heap Removed compiler warnings 2006-11-27 18:16:08 +02:00
innobase Removed compiler warnings 2006-11-27 18:16:08 +02:00
myisam Removed compiler warnings 2006-11-27 18:16:08 +02:00
myisammrg Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-11-28 22:22:52 +01:00
ndb Merge perch.ndb.mysql.com:/home/jonas/src/51-work 2006-12-01 11:32:52 +01:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00