From e5f5457b6fdada826fca23e17b6925e2f9634a03 Mon Sep 17 00:00:00 2001 From: Olivier Bertrand Date: Sat, 11 Mar 2017 14:10:34 +0100 Subject: [PATCH] Also order the result of multiple=1 table, otherwise being different on Linux and Windows causing the test to fail. modified: storage/connect/mysql-test/connect/r/mul_new.result modified: storage/connect/mysql-test/connect/t/mul_new.test --- storage/connect/mysql-test/connect/r/mul_new.result | 2 +- storage/connect/mysql-test/connect/t/mul_new.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/connect/mysql-test/connect/r/mul_new.result b/storage/connect/mysql-test/connect/r/mul_new.result index 1e022907b06..ba8112f5d1f 100644 --- a/storage/connect/mysql-test/connect/r/mul_new.result +++ b/storage/connect/mysql-test/connect/r/mul_new.result @@ -70,7 +70,7 @@ CREATE TABLE t_all ( Chiffre int(3) not null, Lettre char(16) not null) ENGINE=CONNECT TABLE_TYPE=CSV FILE_NAME='num?.csv' HEADER=1 LRECL=20 MULTIPLE=1; -SELECT * FROM t_all; +SELECT * FROM t_all ORDER BY Chiffre; Chiffre Lettre 1 One 2 Two diff --git a/storage/connect/mysql-test/connect/t/mul_new.test b/storage/connect/mysql-test/connect/t/mul_new.test index c65953329e9..33011f6c6a7 100644 --- a/storage/connect/mysql-test/connect/t/mul_new.test +++ b/storage/connect/mysql-test/connect/t/mul_new.test @@ -43,7 +43,7 @@ CREATE TABLE t_all ( Chiffre int(3) not null, Lettre char(16) not null) ENGINE=CONNECT TABLE_TYPE=CSV FILE_NAME='num?.csv' HEADER=1 LRECL=20 MULTIPLE=1; -SELECT * FROM t_all; +SELECT * FROM t_all ORDER BY Chiffre; --echo # --echo # Testing multiple 3