mariadb/storage/ndb/include/ndbapi
unknown cba5f9d95d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge
2007-03-26 20:57:10 +02:00
..
Ndb.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndb_cluster_connection.hpp [PATCH] WL#3704 mgmapi timeouts: update NDBAPI usage of mgmapi for timeouts 2007-03-22 22:35:31 +11:00
ndb_opt_defaults.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbApi.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndbapi_limits.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbBlob.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbDictionary.hpp Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 2007-03-23 14:06:00 +01:00
ndberror.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbError.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbEventOperation.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbIndexOperation.hpp Merge perch.ndb.mysql.com:/home/jonas/src/51-work 2007-01-30 19:33:33 +01:00
NdbIndexScanOperation.hpp Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2007-02-06 23:42:24 +01:00
NdbIndexStat.hpp Many files: 2006-12-27 02:23:51 +01:00
NdbOperation.hpp A few minor cleanups for recent AbortOption behaviour change. 2007-02-20 09:52:18 +01:00
NdbPool.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbRecAttr.hpp Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 2007-03-26 20:57:10 +02:00
NdbReceiver.hpp Merge mysql.com:/home/my/mysql-5.0 2007-01-27 03:46:45 +02:00
NdbScanFilter.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbScanOperation.hpp Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2007-02-07 11:40:43 +01:00
NdbTransaction.hpp Merge perch.ndb.mysql.com:/home/jonas/src/51-work 2007-01-30 19:45:44 +01:00