From 97a4378c5154d68cc67cdb2249c42f1335520d9d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 17 Aug 2007 11:41:32 +0800 Subject: [PATCH] BUG#22240 Add a test case into ndb_restore_compat mysql-test/r/ndb_restore_compat.result: add "order by" to select clause mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data: new data file mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data: new data file mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl: new ctl file mysql-test/std_data/ndb_backup50/BACKUP-2.1.log: new log file mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl: new ctl file mysql-test/std_data/ndb_backup50/BACKUP-2.2.log: new log file mysql-test/t/ndb_restore_compat.test: add "order by" to select clause --- mysql-test/r/ndb_restore_compat.result | 3 +-- .../std_data/ndb_backup50/BACKUP-2-0.1.Data | Bin 19100 -> 19084 bytes .../std_data/ndb_backup50/BACKUP-2-0.2.Data | Bin 18684 -> 16392 bytes .../std_data/ndb_backup50/BACKUP-2.1.ctl | Bin 2592 -> 2592 bytes .../std_data/ndb_backup50/BACKUP-2.1.log | Bin 44 -> 44 bytes .../std_data/ndb_backup50/BACKUP-2.2.ctl | Bin 2592 -> 2592 bytes .../std_data/ndb_backup50/BACKUP-2.2.log | Bin 44 -> 44 bytes mysql-test/t/ndb_restore_compat.test | 2 +- 8 files changed, 2 insertions(+), 3 deletions(-) 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 42e5fa40ad4d5ee1613d309e9a519f9b43e08110..09e6306466681ea1bcf8f98f5daea04da998d0c7 100644 GIT binary patch delta 51 zcmbO;m9b|k;{*kf!u`s(D#A>J7#J9sfS46TZ#3cNWMtax!1;t@vx!i$1uGv=lmP%$ CQVQ+> delta 61 zcmeB~$~b2#;{*kf$9}4xD#A>J7#J9sfS47CnKznnb22h-cHn%%!O08~0AhyCvO-xF Ito$G*0Jud93jhEB 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 d43763e6d7ab1a9722f11fb48bd9878407501f32..a8332239d8f8d4e3037368183dfd86662d281764 100644 GIT binary patch delta 62 zcmew}k+GwJae{(Q;eO>?6=5bq3=9lRK+FoI8G$qmFasHEK+H6`fKz;PIOkG(0D<}m AHa43nyBs8V!G1g)DLAj)p&R;Y2G{qv21hkR{IC afewEw;+zRo1!@(sL1|Efh;d`c7JC3BsWT`5 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 65178a0e7875999a24f66a359543762e7e747ffb..f54103a2a443285bb1c3ad164c72a46306d0a963 100644 GIT binary patch delta 115 zcmZ1=vOr{lf=J&tP7VH5FF);K4 uX{L>D@;L;T0JSXx^4Nix10*^*hf|&vWB}vj4V?0m*K@is@=gB2sRIBisuHvS delta 101 zcmZ1=vOr{lg2-b()lU^+CPEAh3@kv*3dGD4P0R(Efeb+)1_5S91_s87HSv?hSrj(@ qPT&x%1S+fsO0WYl2S~x>98P&wkQT&tP7VH5FF);K4 uX{L>D@;L;T0JSXx^4Nix10*^*hf|&vWB}vj4V?0m*K@is@=gB2sRIBisuHvS delta 101 zcmZ1=vOr{lg2-b()lU^+CPEAh3@kv*3dGD4P0R(Efeb+)1_5S91_s87HSv?hSrj(@ qPT&x%1S+fsO0WYl2S~x>98P&wkQT> $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