mariadb/ndb
unknown ebb2e53a37 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0


mysql-test/r/ndb_alter_table.result:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/kernel/SimBlockList.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/DictCache.cpp:
  Auto merged
ndb/src/ndbapi/DictCache.hpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  merge
ndb/src/common/util/version.c:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
2005-08-18 14:25:00 +02:00
..
bin .del-mysqlclusterd~7ebaf8faea0a1100: 2004-06-16 16:59:33 +00:00
config added ndb_init.h to distribution 2004-12-21 10:37:12 +01:00
demos Removed unnecessary README files 2004-04-14 15:42:56 +02:00
docs Merge mysql.com:/home/jonas/src/mysql-5.0 2005-01-29 07:11:22 +01:00
home removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
include Merge eel.(none):/home/jonas/src/mysql-4.1 2005-08-18 14:25:00 +02:00
lib
ndbapi-examples updated example makefiles to add libmystrings 2005-03-03 20:21:45 +01:00
src Merge eel.(none):/home/jonas/src/mysql-4.1 2005-08-18 14:25:00 +02:00
test ndb - hugo, fix closeTransaction in testPartitioning 2005-07-22 16:29:38 +02:00
tools Merge mysql.com:/home/jonas/src/mysql-4.1 2005-07-25 15:31:38 +02:00
Makefile.am moved sorting and duplicate check for unique indexes from api to kernel 2005-01-27 10:44:47 +01:00