mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage
History
unknown 8f9198ca0b Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/portlib/NdbMem.h:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
  Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
mysql-test/r/ndb_basic.result:
  manual merge
mysql-test/t/ndb_basic.test:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge
2007-01-23 07:25:24 +07:00
..
archive Just adding support for a "minor" version number. 2007-01-21 11:41:00 -08:00
blackhole Many files: 2006-12-31 02:29:11 +01:00
csv Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-11 22:15:20 +03:00
example Many files: 2006-12-31 02:29:11 +01:00
federated Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 2007-01-18 08:30:35 -07:00
heap Fix after manual merge. 2007-01-09 13:07:39 +03:00
innobase Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build 2007-01-15 10:37:27 +01:00
myisam Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 2007-01-18 08:41:52 -07:00
myisammrg Many files: 2006-12-31 02:29:11 +01:00
ndb Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 2007-01-23 07:25:24 +07:00
Makefile.am Many files: 2006-12-31 02:29:11 +01:00