mariadb/storage/ndb/include/portlib
unknown 38ea7f4660 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


configure.in:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/include/portlib/NdbTCP.h:
  Auto merged
storage/ndb/include/transporter/TransporterRegistry.hpp:
  Auto merged
storage/ndb/include/util/SocketServer.hpp:
  Auto merged
storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/include/util/version.h:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
  Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/common/util/version.c:
  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/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2005-07-15 15:08:38 +02:00
..
NdbCondition.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbConfig.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbDaemon.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbEnv.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbHost.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbMain.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbMem.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbMutex.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbSleep.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbTCP.h Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2005-07-15 15:08:38 +02:00
NdbThread.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbTick.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
PortDefs.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
prefetch.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00