From 7be6f52d4a206dc9e926415413c9947209d9c78f Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Wed, 21 Mar 2018 20:06:44 +0200
Subject: [PATCH] MXS-1733 Add test for revealing the problem

---
 .../masking_mysqltest/masking_rules.json        |  9 +++++++++
 .../masking_mysqltest/r/masking_mxs1733.result  | 11 +++++++++++
 .../masking_mysqltest/t/masking_mxs1733.test    | 17 +++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result
 create mode 100644 maxscale-system-test/masking/masking_mysqltest/t/masking_mxs1733.test

diff --git a/maxscale-system-test/masking/masking_mysqltest/masking_rules.json b/maxscale-system-test/masking/masking_mysqltest/masking_rules.json
index 6b7dd4964..17f6c5b67 100644
--- a/maxscale-system-test/masking/masking_mysqltest/masking_rules.json
+++ b/maxscale-system-test/masking/masking_mysqltest/masking_rules.json
@@ -39,6 +39,15 @@
                 "value": "01234-BCD",
                 "fill": "X#@"
             }
+        },
+        {
+            "replace": {
+                "table": "masking_mxs1733",
+                "column": "email"
+            },
+            "with": {
+                "fill": "*"
+            }
         }
     ]
 }
diff --git a/maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result b/maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result
new file mode 100644
index 000000000..b4f053eaa
--- /dev/null
+++ b/maxscale-system-test/masking/masking_mysqltest/r/masking_mxs1733.result
@@ -0,0 +1,11 @@
+drop database if exists maskingdb;
+create database maskingdb;
+use maskingdb;
+create table masking_mxs1733 (email TEXT);
+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
new file mode 100644
index 000000000..acb4b6d97
--- /dev/null
+++ b/maxscale-system-test/masking/masking_mysqltest/t/masking_mxs1733.test
@@ -0,0 +1,17 @@
+#
+# MXS-1733
+#
+# See ../masking_rules.json
+
+--disable_warnings
+drop database if exists maskingdb;
+--enable_warnings
+
+create database maskingdb;
+use maskingdb;
+
+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;