mariadb/storage/ndb/include/kernel
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
..
signaldata Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-03-24 07:43:55 +01:00
AttributeDescriptor.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
AttributeHeader.hpp wl2723 - ndb opt. nr 2006-01-11 11:35:25 +01:00
AttributeList.hpp ndb - bug with index build of unique index with 32 attributes 2005-11-05 22:50:15 +01:00
BlockNumbers.h Import ndb varsize 2005-11-07 12:19:28 +01:00
GlobalSignalNumbers.h Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new 2006-01-31 23:35:23 +01:00
GrepEvent.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Interpreter.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
kernel_config_parameters.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
kernel_types.h Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree. 2005-11-08 17:30:41 +01:00
LogLevel.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_limits.h Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 2006-03-01 10:20:40 +01:00
NodeBitmask.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NodeInfo.hpp ndb-wl2325.patch 2005-09-15 11:33:50 +02:00
NodeState.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
RefConvert.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
trigger_definitions.h configure.in: 2005-11-08 07:41:46 +01:00