bk commit into 5.1 tree (ngrishakin:1.2220)

[Nikolay Grishakin]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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
  1.2220 06/06/26 22:33:46 ngrishakin@stripped +2 -0
  updated test case ndb_dd_advance

  mysql-test/r/ndb_dd_advance.result
    1.4 06/06/26 22:33:19 ngrishakin@stripped +2 -2
    ndb_dd_advance.result

  mysql-test/t/ndb_dd_advance.test
    1.4 06/06/26 22:33:08 ngrishakin@stripped +1 -1
    ndb_dd_advance.test

# 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:	ngrishakin
# Host:	ndb15.mysql.com
# Root:	/home/ndbdev/ngrishakin/mysql-5.1

--- 1.3/mysql-test/r/ndb_dd_advance.result	2006-06-24 01:20:35 +02:00
+++ 1.4/mysql-test/r/ndb_dd_advance.result	2006-06-26 22:33:19 +02:00
@@ -853,11 +853,11 @@
 INSERT INTO test.t2(infoID, shipcode) VALUES
 (1, 'Z001'),
 (2, 'R002');
-SELECT DISTINCTROW email, shipcode FROM test.t1, test.t2 WHERE t1.infoID=t2.infoID order by email;
+SELECT DISTINCTROW email, shipcode FROM test.t1, test.t2 WHERE t1.infoID=t2.infoID order by email, shipcode;
 email	shipcode
 test1@stripped	Z001
-test2@stripped	Z001
 test2@stripped	R002
+test2@stripped	Z001
 test3@stripped	Z001
 SELECT DISTINCTROW email FROM test.t1 ORDER BY dateentered DESC;
 email

--- 1.3/mysql-test/t/ndb_dd_advance.test	2006-06-24 01:20:07 +02:00
+++ 1.4/mysql-test/t/ndb_dd_advance.test	2006-06-26 22:33:08 +02:00
@@ -502,7 +502,7 @@
       (1, 'Z001'),
       (2, 'R002');
 
-SELECT DISTINCTROW email, shipcode FROM test.t1, test.t2 WHERE t1.infoID=t2.infoID order by email;
+SELECT DISTINCTROW email, shipcode FROM test.t1, test.t2 WHERE t1.infoID=t2.infoID order by email, shipcode;
 SELECT DISTINCTROW email FROM test.t1 ORDER BY dateentered DESC;
 SELECT DISTINCTROW email, shipcode FROM test.t1, test.t2 WHERE test.t1.infoID=test.t2.infoID ORDER BY dateentered DESC;
 drop table test.t1,test.t2;