unknown ad97a0d0ab Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge ...

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged

2006-05-10 21:38:48 +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 neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge

2006-05-10 21:38:48 +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 neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge

2006-05-10 21:38:48 +02:00

test

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

2006-05-05 11:38:05 +03:00

tools

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

2006-05-05 11:38:05 +03:00

Makefile.am

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

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