mariadb/storage/ndb/test/include
unknown b70b75567a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  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/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/conf-dl145a.txt:
  Auto merged
storage/ndb/test/run-test/conf-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/run-test/conf-shark.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  merge
storage/ndb/test/run-test/Makefile.am:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
storage/ndb/tools/desc.cpp:
  merge
2006-03-24 07:43:55 +01:00
..
CpcClient.hpp Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-10 00:45:27 +02:00
getarg.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
HugoAsynchTransactions.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
HugoCalculator.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
HugoOperations.hpp ndb-wl2325.patch 2005-09-15 11:33:50 +02:00
HugoTransactions.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
NdbBackup.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbConfig.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbGrep.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbRestarter.hpp Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-03-24 07:43:55 +01:00
NdbRestarts.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbSchemaCon.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbSchemaOp.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
NDBT.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NDBT_DataSet.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NDBT_DataSetTransaction.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NDBT_Error.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NDBT_Output.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NDBT_ResultRow.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NDBT_ReturnCodes.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NDBT_Stats.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NDBT_Table.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
NDBT_Tables.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
NDBT_Test.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
NdbTest.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbTimer.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
TestNdbEventOperation.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
UtilTransactions.hpp Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-22 23:15:51 +02:00