mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

Browse source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/include/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/Ndb.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/NdbApi.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndberr.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndbif.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndbinit.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/include/HugoTransactions.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/ndbapi/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/src/HugoTransactions.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
This commit is contained in:
unknown 2006-07-05 16:30:12 +02:00
commit 352cd7a99c
Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available