Skip to content

Commit

Permalink
- Fix failing test tbl_thread on linux
Browse files Browse the repository at this point in the history
  (and mask another fail until MDEV-10179 is fixed)
  modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test
  • Loading branch information
Buggynours committed Aug 17, 2017
1 parent 60fa113 commit 2db52e1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 32 deletions.
22 changes: 3 additions & 19 deletions storage/connect/mysql-test/connect/r/tbl_thread.result
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ a b
11 test11
connection default;
CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=MYSQL
CONNECTION='mysql://root@localhost:MASTER_PORT/test/rt2';
CONNECTION='mysql://root@127.0.0.1:MASTER_PORT/test/rt2';
SELECT * FROM t2;
a b
4 test04
5 test05
6 test06
7 test07
CREATE TABLE t3 ENGINE=CONNECT TABLE_TYPE=MYSQL
CONNECTION='mysql://root@localhost:SLAVE_PORT/test/rt3';
CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/test/rt3';
SELECT * FROM t3;
a b
8 test08
Expand Down Expand Up @@ -93,24 +93,8 @@ v
11
DROP TABLE t1,t2,total;
#
# Old thread TBL tables test not modified
# Old thread TBL tables test not modified (suppressed until MDEV-10179 is fixed)
#
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=MYSQL SRCDEF='select 11 as v';
SELECT * FROM t1;
v
11
CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=MYSQL SRCDEF='select 22 as v';
SELECT * FROM t2;
v
22
CREATE TABLE total (v BIGINT(20) UNSIGNED NOT NULL) ENGINE=CONNECT TABLE_TYPE=TBL TABLE_LIST='t1,t2' OPTION_LIST='thread=yes,port=PORT';;
SELECT * FROM total order by v desc;
v
22
11
DROP TABLE total;
DROP TABLE t1;
DROP TABLE t2;
connection master;
DROP TABLE IF EXISTS connect.t1;
DROP DATABASE IF EXISTS connect;
Expand Down
26 changes: 13 additions & 13 deletions storage/connect/mysql-test/connect/t/tbl_thread.test
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ connection default;

--replace_result $MASTER_MYPORT MASTER_PORT
eval CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=MYSQL
CONNECTION='mysql://root@localhost:$MASTER_MYPORT/test/rt2';
CONNECTION='mysql://root@127.0.0.1:$MASTER_MYPORT/test/rt2';
SELECT * FROM t2;

--replace_result $SLAVE_MYPORT SLAVE_PORT
eval CREATE TABLE t3 ENGINE=CONNECT TABLE_TYPE=MYSQL
CONNECTION='mysql://root@localhost:$SLAVE_MYPORT/test/rt3';
CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/test/rt3';
SELECT * FROM t3;

--replace_result $PORT PORT
Expand Down Expand Up @@ -71,20 +71,20 @@ SELECT * FROM total order by v desc;
DROP TABLE t1,t2,total;

--echo #
--echo # Old thread TBL tables test not modified
--echo # Old thread TBL tables test not modified (suppressed until MDEV-10179 is fixed)
--echo #
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=MYSQL SRCDEF='select 11 as v';
SELECT * FROM t1;
#CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=MYSQL SRCDEF='select 11 as v';
#SELECT * FROM t1;

CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=MYSQL SRCDEF='select 22 as v';
SELECT * FROM t2;
#CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=MYSQL SRCDEF='select 22 as v';
#SELECT * FROM t2;

--replace_result $PORT PORT
--eval CREATE TABLE total (v BIGINT(20) UNSIGNED NOT NULL) ENGINE=CONNECT TABLE_TYPE=TBL TABLE_LIST='t1,t2' OPTION_LIST='thread=yes,port=$PORT';
SELECT * FROM total order by v desc;
#--replace_result $PORT PORT
#--eval CREATE TABLE total (v BIGINT(20) UNSIGNED NOT NULL) ENGINE=CONNECT TABLE_TYPE=TBL TABLE_LIST='t1,t2' OPTION_LIST='thread=yes,port=$PORT';
#SELECT * FROM total order by v desc;

DROP TABLE total;
DROP TABLE t1;
DROP TABLE t2;
#DROP TABLE total;
#DROP TABLE t1;
#DROP TABLE t2;

-- source myconn_cleanup.inc

0 comments on commit 2db52e1

Please sign in to comment.