mariadb/storage/ndb/test/include
unknown f488c925e6 Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Manual merge.
storage/ndb/test/ndbapi/testBasic.cpp:
  Manual merge.
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Manual merge.
2007-04-25 15:40:13 +02:00
..
CpcClient.hpp [PATCH] WL#3704 mgmapi timeouts: Correct cpc client usage of Socket Input/OutputStream for timeouts 2007-03-22 22:35:55 +11:00
getarg.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
HugoAsynchTransactions.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
HugoCalculator.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
HugoOperations.hpp Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca 2007-04-25 15:40:13 +02:00
HugoTransactions.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbBackup.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbConfig.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbGrep.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbMixRestarter.hpp ndb - 2007-04-17 09:54:36 +02:00
NdbRestarter.hpp ndb - 2007-04-23 15:48:06 +02:00
NdbRestarts.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbSchemaCon.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbSchemaOp.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NDBT.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NDBT_DataSet.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NDBT_DataSetTransaction.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NDBT_Error.hpp Bug#26765 "typo when running mysql-test-run" 2007-03-15 23:17:44 +03:00
NDBT_Output.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NDBT_ResultRow.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NDBT_ReturnCodes.h Bug#26765 "typo when running mysql-test-run" 2007-03-15 23:17:44 +03:00
NDBT_Stats.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NDBT_Table.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NDBT_Tables.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NDBT_Test.hpp Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj 2007-03-01 17:43:14 +08:00
NdbTest.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbTimer.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
TestNdbEventOperation.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
UtilTransactions.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00