mariadb/storage/ndb/include/util
unknown 2776a71bb2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbReceiver.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbReceiver.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/include/util/BaseString.hpp:
  Auto merged
storage/ndb/src/common/util/BaseString.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/include/ndbapi/Ndb.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/include/util/Vector.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/DictCache.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/DictCache.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/Makefile.am:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/Ndb.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
  - manual merge to 5.1
2007-04-11 15:51:09 +02:00
..
BaseString.hpp Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 2007-04-11 15:51:09 +02:00
basestring_vsnprintf.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
Bitmask.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ConfigValues.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
File.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
InputStream.hpp [PATCH] WL#3704 mgmapi timeouts: For mgm server, have timeout per operation, not for entire connection (i.e. fix the bug) 2007-03-22 22:36:07 +11:00
md5_hash.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndb_opts.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbAutoPtr.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbOut.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NdbSqlUtil.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
OutputStream.hpp Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 2007-03-23 21:50:57 +01:00
Parser.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
Properties.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
random.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
SimpleProperties.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
socket_io.h [PATCH] WL#3704 mgmapi timeouts: Change to have total timeout for call, not per request 2007-03-22 22:35:07 +11:00
SocketAuthenticator.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
SocketClient.hpp Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487 2007-01-24 00:34:12 +11:00
SocketServer.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
UtilBuffer.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
uucode.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
Vector.hpp Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 2007-04-11 15:51:09 +02:00
version.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00