diff options
| author | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-30 16:17:32 +0800 |
|---|---|---|
| committer | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-30 16:17:32 +0800 |
| commit | 2e081a2d8b83da72afdee01b3f2855b53f8d14bd (patch) | |
| tree | dbe53e1844dee62738f4e066a77830105fc0e96a /mysql-test/std_data | |
| parent | 4ad9539a24b5f92d94edc5d63f725ac2abd0dbe7 (diff) | |
| parent | b6621a44a43162e1c638ef00114fa39548c40c7b (diff) | |
| download | mariadb-git-2e081a2d8b83da72afdee01b3f2855b53f8d14bd.tar.gz | |
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
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
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data | bin | 0 -> 19084 bytes |
| -rw-r--r-- | mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data | bin | 0 -> 16392 bytes |
| -rw-r--r-- | mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl | bin | 0 -> 2592 bytes |
| -rw-r--r-- | mysql-test/std_data/ndb_backup50/BACKUP-2.1.log | bin | 0 -> 44 bytes |
| -rw-r--r-- | mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl | bin | 0 -> 2592 bytes |
| -rw-r--r-- | mysql-test/std_data/ndb_backup50/BACKUP-2.2.log | bin | 0 -> 44 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data b/mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data Binary files differnew file mode 100644 index 00000000000..09e63064666 --- /dev/null +++ b/mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data b/mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data Binary files differnew file mode 100644 index 00000000000..a8332239d8f --- /dev/null +++ b/mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl b/mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl Binary files differnew file mode 100644 index 00000000000..f54103a2a44 --- /dev/null +++ b/mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2.1.log b/mysql-test/std_data/ndb_backup50/BACKUP-2.1.log Binary files differnew file mode 100644 index 00000000000..5564f952e66 --- /dev/null +++ b/mysql-test/std_data/ndb_backup50/BACKUP-2.1.log diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl b/mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl Binary files differnew file mode 100644 index 00000000000..f54103a2a44 --- /dev/null +++ b/mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2.2.log b/mysql-test/std_data/ndb_backup50/BACKUP-2.2.log Binary files differnew file mode 100644 index 00000000000..5564f952e66 --- /dev/null +++ b/mysql-test/std_data/ndb_backup50/BACKUP-2.2.log |