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

8 files changed, 11 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
new 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
new 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
new 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
new 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
new 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
new file mode 100644
index 00000000000..5564f952e66
--- /dev/null
+++ b/mysql-test/std_data/ndb_backup50/BACKUP-2.2.log
diff --git a/mysql-test/suite/ndb/r/ndb_restore_compat.result b/mysql-test/suite/ndb/r/ndb_restore_compat.result
index db17f9af32b..f2630573220 100644
--- a/mysql-test/suite/ndb/r/ndb_restore_compat.result
+++ b/mysql-test/suite/ndb/r/ndb_restore_compat.result
@@ -111,4 +111,9 @@ SYSTEM_VALUES_ID	VALUE
 SELECT * FROM mysql.ndb_apply_status WHERE server_id=0;
 server_id	epoch	log_name	start_pos	end_pos
 0	331		0	0
+SELECT * FROM DESCRIPTION ORDER BY USERNAME;
+USERNAME	ADDRESS
+Guangbao Ni	Suite 503, 5F NCI Tower, A12 Jianguomenwai Avenue Chaoyang District, Beijing, 100022  PRC
+USERNAME Varchar(255;latin1_swedish_ci) NULL AT=SHORT_VAR ST=MEMORY
+ADDRESS Longvarchar(2002;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY
 DROP DATABASE BANK;
diff --git a/mysql-test/suite/ndb/t/ndb_restore_compat.test b/mysql-test/suite/ndb/t/ndb_restore_compat.test
index 2622aec1d50..8e5b30aa6fd 100644
--- a/mysql-test/suite/ndb/t/ndb_restore_compat.test
+++ b/mysql-test/suite/ndb/t/ndb_restore_compat.test
@@ -58,4 +58,10 @@ SELECT * FROM ACCOUNT       ORDER BY ACCOUNT_ID;
 SELECT COUNT(*) FROM TRANSACTION;
 SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
 SELECT * FROM mysql.ndb_apply_status WHERE server_id=0;
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 1 -m -p 1 -s -r $MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
+--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 2 -p 1 -s -r $MYSQL_TEST_DIR/std_data/ndb_backup50 >> $NDB_TOOLS_OUTPUT
+SELECT * FROM DESCRIPTION ORDER BY USERNAME;
+--exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d BANK DESCRIPTION | grep SHORT_VAR
+--exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d BANK DESCRIPTION | grep MEDIUM_VAR
+
 DROP DATABASE BANK;