mariadb/storage/ndb/include/ndbapi
unknown 02c63a3e57 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/t/ndb_lock.test:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
mysql-test/r/ndb_lock.result:
  Merge (using local)
sql/ha_ndbcluster.cc:
  Merge
sql/ha_ndbcluster.h:
  Merge
2006-08-15 14:39:48 +02:00
..
Ndb.hpp Bug #20742 Assertion in drop of ndb binlog events after node restart 2006-07-04 17:58:20 +02:00
ndb_cluster_connection.hpp Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-05-16 10:37:40 +02:00
ndb_opt_defaults.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbApi.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbapi_limits.h Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-20 06:25:02 +02:00
NdbBlob.hpp Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 2006-06-17 11:10:43 +02:00
NdbDictionary.hpp Fix for Bug #18413 Data usage for varsize columns are not correctly reported to mysqld 2006-07-03 17:09:32 +02:00
ndberror.h wl2325 wl2324 2006-01-12 19:51:02 +01:00
NdbError.hpp wl2325 wl2324 2006-01-12 19:51:02 +01:00
NdbEventOperation.hpp NdbEventOperationImpl.cpp, NdbEventOperation.cpp, NdbEventOperation.hpp: 2006-02-08 09:58:47 +01:00
NdbIndexOperation.hpp Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 2006-03-23 22:39:30 +01:00
NdbIndexScanOperation.hpp Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-06-27 11:46:02 +02:00
NdbIndexStat.hpp removing the usage if the ndb local dict cache to adress the 241 errors we get now and then 2006-05-04 13:58:17 +02:00
NdbOperation.hpp Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-10 21:38:48 +02:00
NdbPool.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbRecAttr.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
NdbReceiver.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbScanFilter.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbScanOperation.hpp Merge perch.ndb.mysql.com:/home/jonas/src/51-work 2006-06-28 08:47:43 +02:00
NdbTransaction.hpp Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2006-08-15 14:39:48 +02:00