bk commit into 5.1 tree (tomas:1.2398)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2398 07/01/23 09:52:13 tomas@stripped +1 -0
  correct manual merge

  mysql-test/r/ndb_basic.result
    1.50 07/01/23 09:52:02 tomas@stripped +6 -6
    correct manual merge

# 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:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.1-new-ndb

--- 1.49/mysql-test/r/ndb_basic.result	2007-01-23 07:25:17 +07:00
+++ 1.50/mysql-test/r/ndb_basic.result	2007-01-23 09:52:02 +07:00
@@ -757,12 +757,12 @@
 INSERT INTO t1 VALUES
 ("a","ab","abc"),("b","abc","abcd"),("c","abc","ab"),("d","ab","ab"),("e","abc","abc");
 SELECT * FROM t1 ORDER BY a;
-a       b       c
-a       ab      abc
-b       abc     abcd
-c       abc     ab
-d       ab      ab
-e       abc     abc
+a	b	c
+a	ab	abc
+b	abc	abcd
+c	abc	ab
+d	ab	ab
+e	abc	abc
 DROP TABLE t1;
 End of 5.0 tests
 CREATE TABLE t1 (a VARCHAR(255) NOT NULL,