unknown fd2c17db94 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 ...

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  SCCS merged

2007-02-06 23:42:24 +01:00

..

bin

Changes to create storage directory for storage engines.

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

config

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

demos

Changes to create storage directory for storage engines.

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

docs

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

include

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0

2007-02-06 23:42:24 +01:00

lib

Changes to create storage directory for storage engines.

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

ndbapi-examples

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1

2006-12-31 01:04:59 +01:00

src

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0

2007-02-06 23:42:24 +01:00

test

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

tools

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

Makefile.am

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-31 01:32:21 +01:00

plug.in

Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed.

2006-08-18 21:19:19 -07:00