diff --git a/mysql-test/r/ndb_restore_compat.result b/mysql-test/r/ndb_restore_compat.result index 398135c7861..f2630573220 100644 --- a/mysql-test/r/ndb_restore_compat.result +++ b/mysql-test/r/ndb_restore_compat.result @@ -111,10 +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; +SELECT * FROM DESCRIPTION ORDER BY USERNAME; USERNAME ADDRESS Guangbao Ni Suite 503, 5F NCI Tower, A12 Jianguomenwai Avenue Chaoyang District, Beijing, 100022 PRC -David Li 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/std_data/ndb_backup50/BACKUP-2-0.1.Data b/mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data index 42e5fa40ad4..09e63064666 100644 Binary files a/mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data and b/mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data differ 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 index d43763e6d7a..a8332239d8f 100644 Binary files a/mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data and b/mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data differ diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl b/mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl index 65178a0e787..f54103a2a44 100644 Binary files a/mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl and b/mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl differ diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2.1.log b/mysql-test/std_data/ndb_backup50/BACKUP-2.1.log index 5df48c1b10d..5564f952e66 100644 Binary files a/mysql-test/std_data/ndb_backup50/BACKUP-2.1.log and b/mysql-test/std_data/ndb_backup50/BACKUP-2.1.log differ diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl b/mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl index 65178a0e787..f54103a2a44 100644 Binary files a/mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl and b/mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl differ diff --git a/mysql-test/std_data/ndb_backup50/BACKUP-2.2.log b/mysql-test/std_data/ndb_backup50/BACKUP-2.2.log index 5df48c1b10d..5564f952e66 100644 Binary files a/mysql-test/std_data/ndb_backup50/BACKUP-2.2.log and b/mysql-test/std_data/ndb_backup50/BACKUP-2.2.log differ diff --git a/mysql-test/t/ndb_restore_compat.test b/mysql-test/t/ndb_restore_compat.test index 46d64892190..8e5b30aa6fd 100644 --- a/mysql-test/t/ndb_restore_compat.test +++ b/mysql-test/t/ndb_restore_compat.test @@ -60,7 +60,7 @@ 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; +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