bk commit into 5.1 tree (gni:1.2528) BUG#22240

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of gni. When gni does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-17 11:41:32+08:00, gni@stripped +8 -0
  BUG#22240 Add a test case into ndb_restore_compat

  mysql-test/r/ndb_restore_compat.result@stripped, 2007-08-17 11:41:29+08:00, gni@stripped +1 -2
    add "order by" to select clause

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.1.Data@stripped, 2007-08-17 11:41:29+08:00, gni@stripped +325 -325
    new data file

  mysql-test/std_data/ndb_backup50/BACKUP-2-0.2.Data@stripped, 2007-08-17 11:41:29+08:00, gni@stripped +365 -416
    new data file

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.ctl@stripped, 2007-08-17 11:41:29+08:00, gni@stripped +8 -8
    new ctl file

  mysql-test/std_data/ndb_backup50/BACKUP-2.1.log@stripped, 2007-08-17 11:41:29+08:00, gni@stripped +1 -1
    new log file

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.ctl@stripped, 2007-08-17 11:41:29+08:00, gni@stripped +8 -8
    new ctl file

  mysql-test/std_data/ndb_backup50/BACKUP-2.2.log@stripped, 2007-08-17 11:41:29+08:00, gni@stripped +1 -1
    new log file

  mysql-test/t/ndb_restore_compat.test@stripped, 2007-08-17 11:41:29+08:00, gni@stripped +1 -1
    add "order by" to select clause

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240

Binary files /tmp/bk_BACKUP-2-0.1.Data-1.1_xUO8X4 and /tmp/bk_BACKUP-2-0.1.Data-1.2_Huxf7e differ

Binary files /tmp/bk_BACKUP-2-0.2.Data-1.1_XojpCC and /tmp/bk_BACKUP-2-0.2.Data-1.2_jF6QHP differ

Binary files /tmp/bk_BACKUP-2.1.ctl-1.1_VWixyg and /tmp/bk_BACKUP-2.1.ctl-1.2_RzQhgu differ

Binary files /tmp/bk_BACKUP-2.1.log-1.1_B5zA9T and /tmp/bk_BACKUP-2.1.log-1.2_bNlKq6 differ

Binary files /tmp/bk_BACKUP-2.2.ctl-1.1_3S9Gpv and /tmp/bk_BACKUP-2.2.ctl-1.2_333m9H differ

Binary files /tmp/bk_BACKUP-2.2.log-1.1_j2dEga and /tmp/bk_BACKUP-2.2.log-1.2_t4wQ2p differ

--- 1.6/mysql-test/r/ndb_restore_compat.result	2007-08-17 11:41:43 +08:00
+++ 1.7/mysql-test/r/ndb_restore_compat.result	2007-08-17 11:41:43 +08:00
@@ -111,10 +111,9 @@
 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;

--- 1.5/mysql-test/t/ndb_restore_compat.test	2007-08-17 11:41:43 +08:00
+++ 1.6/mysql-test/t/ndb_restore_compat.test	2007-08-17 11:41:43 +08:00
@@ -60,7 +60,7 @@
 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