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

Browse Source

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


mysql-test/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
mysql-test/suite/ndb/r/ndb_restore_compat.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore_compat.test:
  Auto merged

...

This commit is contained in:

unknown

2007-08-30 16:17:32 +08:00

parent 4ad9539a24 b6621a44a4

commit 2e081a2d8b

12 changed files with 22 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data Normal file

Binary file not shown.

BIN

mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data Normal file

Binary file not shown.

BIN

mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl Normal file

Binary file not shown.

BIN

mysql-test/std_data/ndb_backup50/BACKUP-2.1.log Normal file

Binary file not shown.

BIN

mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl Normal file

Binary file not shown.

BIN

mysql-test/std_data/ndb_backup50/BACKUP-2.2.log Normal file

Binary file not shown.