From 3c5a9320107d23056abae27636433b4e080c45c0 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 9 May 2019 17:08:16 +0300 Subject: [PATCH] Fix masking_mysqltest for 2.3 Since UNIONs that would allow a column to be masked are rejected, there is no need to check that masking is performed since we will never get that far. --- .../masking/masking_mysqltest/r/masking_mxs1733.result | 3 --- .../masking/masking_mysqltest/t/masking_mxs1733.test | 1 - 2 files changed, 4 deletions(-) diff --git a/maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result b/maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result index b4f053eaa..3cf294fcf 100644 --- a/maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result +++ b/maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result @@ -6,6 +6,3 @@ insert into masking_mxs1733 values ("john@example.com"); select * from masking_mxs1733; email **************** -select * from masking_mxs1733 UNION select * from masking_mxs1733; -email -**************** diff --git a/maxscale-system-test/masking/masking_mysqltest/t/masking_mxs1733.test b/maxscale-system-test/masking/masking_mysqltest/t/masking_mxs1733.test index acb4b6d97..4b66aab57 100644 --- a/maxscale-system-test/masking/masking_mysqltest/t/masking_mxs1733.test +++ b/maxscale-system-test/masking/masking_mysqltest/t/masking_mxs1733.test @@ -14,4 +14,3 @@ create table masking_mxs1733 (email TEXT); insert into masking_mxs1733 values ("john@example.com"); select * from masking_mxs1733; -select * from masking_mxs1733 UNION select * from masking_mxs1733;