diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-01-23 09:52:13 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-01-23 09:52:13 +0700 |
| commit | e7b4e5091923c5959a6de0d36ecc4d029933d940 (patch) | |
| tree | 16e9fa7abff756e3d64788a7bff405910c054d77 /mysql-test | |
| parent | 8f9198ca0b40c99b3764e170481648330b18efc3 (diff) | |
| download | mariadb-git-e7b4e5091923c5959a6de0d36ecc4d029933d940.tar.gz | |
correct manual merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ndb_basic.result | 12 |
1 files 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, |