From e7b4e5091923c5959a6de0d36ecc4d029933d940 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 23 Jan 2007 09:52:13 +0700 Subject: [PATCH] correct manual merge --- mysql-test/r/ndb_basic.result | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result index ec7f8186c49..b4a55641e80 100644 --- a/mysql-test/r/ndb_basic.result +++ b/mysql-test/r/ndb_basic.result @@ -757,12 +757,12 @@ PRIMARY KEY (b,c)) ENGINE=ndbcluster; 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,