summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2016-07-15 00:50:18 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2016-07-15 00:50:18 +0200
commitec725089cfde2886d74c7939c64ad6e2266dc853 (patch)
treec64fbda67d5f537c1381c94546cbd37fbb1b842c /storage
parent44012db6350b51ad7e78f286dfa6e5d4ae84f807 (diff)
downloadmariadb-git-ec725089cfde2886d74c7939c64ad6e2266dc853.tar.gz
Change jdbc test to reflect girls.txt LF ending
Diffstat (limited to 'storage')
-rw-r--r--storage/connect/mysql-test/connect/r/jdbc.result2
-rw-r--r--storage/connect/mysql-test/connect/t/jdbc.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/mysql-test/connect/r/jdbc.result b/storage/connect/mysql-test/connect/r/jdbc.result
index 9b6f0e65102..895b4070d70 100644
--- a/storage/connect/mysql-test/connect/r/jdbc.result
+++ b/storage/connect/mysql-test/connect/r/jdbc.result
@@ -111,7 +111,7 @@ CREATE TABLE t3 (
name CHAR(9) NOT NULL,
city CHAR(12) NOT NULL,
age INT(2))
-ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='girls.txt' ENDING=2;
+ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='girls.txt' ENDING=1;
SELECT g.name, b.name, g.city FROM t3 g STRAIGHT_JOIN connect.boys b where g.city = b.city;
name name city
Mary John Boston
diff --git a/storage/connect/mysql-test/connect/t/jdbc.test b/storage/connect/mysql-test/connect/t/jdbc.test
index 247bd406100..41fd298776b 100644
--- a/storage/connect/mysql-test/connect/t/jdbc.test
+++ b/storage/connect/mysql-test/connect/t/jdbc.test
@@ -81,7 +81,7 @@ CREATE TABLE t3 (
name CHAR(9) NOT NULL,
city CHAR(12) NOT NULL,
age INT(2))
-ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='girls.txt' ENDING=2;
+ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='girls.txt' ENDING=1;
SELECT g.name, b.name, g.city FROM t3 g STRAIGHT_JOIN connect.boys b where g.city = b.city;
SELECT g.name, b.name, g.city FROM t3 g STRAIGHT_JOIN t1 b where g.city = b.city;
DROP TABLE t1, t3, connect.boys;