mariadb/ndb/src
unknown 7a5ec7606d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  linux.site:/home/marty/MySQL/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/default.c:
  Auto merged
ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2005-06-30 12:20:52 +02:00
..
common Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-06-30 12:20:52 +02:00
cw merge 2005-06-13 10:42:12 +02:00
external/WIN32.x86/sci/lib removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
kernel Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-06-30 12:20:52 +02:00
mgmapi merge 2005-05-04 18:48:33 +02:00
mgmclient Merge dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1 2005-06-02 21:31:25 +02:00
mgmsrv Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-07 10:50:27 +02:00
ndbapi ndb - valgrind fixes 2005-06-13 16:19:20 +02:00
old_files merged ndb api blobs 2004-06-10 14:02:30 +02:00
Makefile.am ndb - change "ndb_mgmd --interactive" to use mgmclient interpreter 2005-01-09 13:53:54 +01:00