From ef4780193bd6e2132769b63e8feea1815509e7f4 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Tue, 15 Apr 2025 12:25:46 +0300 Subject: [PATCH] Fix test mcs7130_regression_bug3935 --- .../r/mcs7130_regression_bug3935.result | 11 ++++------- .../t/mcs7130_regression_bug3935.test | 14 ++++++-------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/mysql-test/columnstore/devregression/r/mcs7130_regression_bug3935.result b/mysql-test/columnstore/devregression/r/mcs7130_regression_bug3935.result index 4a547d347..96f2a3736 100644 --- a/mysql-test/columnstore/devregression/r/mcs7130_regression_bug3935.result +++ b/mysql-test/columnstore/devregression/r/mcs7130_regression_bug3935.result @@ -6,13 +6,10 @@ FIELDS TERMINATED BY '|' LINES TERMINATED BY '/n' from nation; select n_nationkey, n_name into outfile '/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '/n' from nation; -SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name FROM nation -ORDER BY n_name DESC) INTO OUTFILE -'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n'; -SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name FROM nation -ORDER BY n_name DESC) INTO OUTFILE -'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' -LINES TERMINATED BY '\n'; +SELECT * INTO OUTFILE '/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n' +FROM (SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name FROM nation ORDER BY n_name DESC)) t; +SELECT * INTO OUTFILE '/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\n' +FROM (SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name FROM nation ORDER BY n_name DESC)) t; SELECT * INTO OUTFILE '/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"' diff --git a/mysql-test/columnstore/devregression/t/mcs7130_regression_bug3935.test b/mysql-test/columnstore/devregression/t/mcs7130_regression_bug3935.test index a5001e1d6..a111e77ee 100644 --- a/mysql-test/columnstore/devregression/t/mcs7130_regression_bug3935.test +++ b/mysql-test/columnstore/devregression/t/mcs7130_regression_bug3935.test @@ -23,15 +23,13 @@ FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '/n' from nation; --exec rm -f /tmp/bug3935_outfile.txt -SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name FROM nation -ORDER BY n_name DESC) INTO OUTFILE -'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n'; ---exec rm -f /tmp/bug3935_outfile.txt +SELECT * INTO OUTFILE '/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n' +FROM (SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name FROM nation ORDER BY n_name DESC)) t; + +--exec rm -f /tmp/bug3935_outfile.txt +SELECT * INTO OUTFILE '/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' LINES TERMINATED BY '\n' +FROM (SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name FROM nation ORDER BY n_name DESC)) t; -SELECT 'ID', 'Name' UNION (SELECT n_nationkey, n_name FROM nation -ORDER BY n_name DESC) INTO OUTFILE -'/tmp/bug3935_outfile.txt' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' -LINES TERMINATED BY '\n'; --exec rm -f /tmp/bug3935_outfile.txt SELECT *