mariadb/ndb
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
..
bin
config
demos
docs
home
include Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-06-30 12:20:52 +02:00
lib
ndbapi-examples
src Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-06-30 12:20:52 +02:00
test Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-06-30 12:20:52 +02:00
tools merge 2005-06-13 10:42:12 +02:00
Makefile.am