unknown d749d90528 Merge mysql.com:/space/pekka/ndb/version/my51 ...

into  mysql.com:/space/pekka/ndb/version/my51-bug14509


mysql-test/r/ndb_basic.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged

2006-05-25 16:20:34 +02:00

..

bin

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

config

fix my_compress/zlib link error

2006-01-17 18:35:15 +01:00

demos

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

docs

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

2005-11-23 14:57:00 +02:00

include

Merge mysql.com:/space/pekka/ndb/version/my51

2006-05-25 16:20:34 +02:00

lib

Changes to create storage directory for storage engines.

2005-04-26 18:19:54 -07:00

ndbapi-examples

ndb - wl#2972 rbr blobs ndb api support

2006-01-19 14:01:32 +01:00

src

Merge mysql.com:/space/pekka/ndb/version/my51

2006-05-25 16:20:34 +02:00

test

Merge mysql.com:/space/pekka/ndb/version/my51

2006-05-25 16:20:34 +02:00

tools

Merge mysql.com:/space/pekka/ndb/version/my51

2006-05-25 16:20:34 +02:00

Makefile.am

Nuke all of the old_* directories in the ndb tree.

2006-04-18 12:12:46 -07:00