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

..

restore

Merge mysql.com:/space/pekka/ndb/version/my50-bug14509

2006-05-17 12:56:59 +02:00

clean-links.sh

Changes to create storage directory for storage engines.

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

delete_all.cpp

Merge mysql.com:/home/my/mysql-5.0

2006-05-04 15:58:30 +03:00

desc.cpp

Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

2006-05-17 08:34:48 +02:00

drop_index.cpp

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

2005-07-21 12:50:24 +02:00

drop_tab.cpp

Changes to create storage directory for storage engines.

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

listTables.cpp

Added verification test of on-line (non-copying) alter table

2006-04-27 15:13:21 +02:00

make-errors.pl

Changes to create storage directory for storage engines.

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

make-links.sh

Changes to create storage directory for storage engines.

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

Makefile.am

Merge

2006-03-30 22:10:48 +02:00

ndb_condig.cpp

Merge mysql.com:/home/my/mysql-5.0

2005-11-05 01:32:55 +02:00

ndb_error_reporter

wl2723 - ndb opt. nr

2006-01-11 11:35:25 +01:00

ndb_size.pl

Merge mysql.com:/home/kostja/mysql/tmp_merge

2006-02-02 23:27:06 +03:00

ndb_size.tmpl

Merge mysql.com:/home/mysql_src/mysql-5.0-van

2005-11-19 10:43:28 +01:00

ndb_test_platform.cpp

Changes to create storage directory for storage engines.

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

ndbsql.cpp

Changes to create storage directory for storage engines.

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

rgrep

Changes to create storage directory for storage engines.

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

select_all.cpp

wl2723 - ndb opt. nr

2006-01-11 11:35:25 +01:00

select_count.cpp

Changes to create storage directory for storage engines.

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

waiter.cpp

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

2006-05-17 00:27:19 +02:00