Skip to content

M
mariadb
Commit aafb35d0 authored by Luis Soares's avatar Luis Soares
Browse files
Options

BUG#57899: Certain reserved words should not be reserved 

Small fix for the test case. The column named "slow" was
used twice in the SELECTs. As a consequence, the column
named "ignore_server_ids" was not used.

To fix this we simply replace the second column selected 
named "slow" with a column named "ignore_server_ids".
parent 1602ffb8
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
mysql-test/r/keywords.result
View file @ aafb35d0
...@@ -50,16 +50,16 @@ INSERT INTO slow(slow, general, master_heartbeat_period, ignore_server_ids) VALU ...@@ -50,16 +50,16 @@ INSERT INTO slow(slow, general, master_heartbeat_period, ignore_server_ids) VALU
INSERT INTO slow(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7); INSERT INTO slow(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7);
INSERT INTO slow(slow, general) VALUES (1,2), (5,6); INSERT INTO slow(slow, general) VALUES (1,2), (5,6);
INSERT INTO slow(slow) VALUES (1), (5); INSERT INTO slow(slow) VALUES (1), (5);
SELECT slow, general, master_heartbeat_period, slow FROM slow ORDER BY slow; SELECT slow, general, master_heartbeat_period, ignore_server_ids FROM slow ORDER BY slow;
slow general master_heartbeat_period slow slow general master_heartbeat_period ignore_server_ids
1 2 3 1 1 2 3 4
1 2 3 1 1 2 3 NULL
1 2 NULL 1 1 2 NULL NULL
1 NULL NULL 1 1 NULL NULL NULL
5 6 7 5 5 6 7 8
5 6 7 5 5 6 7 NULL
5 6 NULL 5 5 6 NULL NULL
5 NULL NULL 5 5 NULL NULL NULL
SELECT slow, general, master_heartbeat_period FROM slow ORDER BY slow; SELECT slow, general, master_heartbeat_period FROM slow ORDER BY slow;
slow general master_heartbeat_period slow general master_heartbeat_period
1 2 3 1 2 3
...@@ -96,16 +96,16 @@ INSERT INTO general(slow, general, master_heartbeat_period, ignore_server_ids) V ...@@ -96,16 +96,16 @@ INSERT INTO general(slow, general, master_heartbeat_period, ignore_server_ids) V
INSERT INTO general(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7); INSERT INTO general(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7);
INSERT INTO general(slow, general) VALUES (1,2), (5,6); INSERT INTO general(slow, general) VALUES (1,2), (5,6);
INSERT INTO general(slow) VALUES (1), (5); INSERT INTO general(slow) VALUES (1), (5);
SELECT slow, general, master_heartbeat_period, slow FROM general ORDER BY slow; SELECT slow, general, master_heartbeat_period, ignore_server_ids FROM general ORDER BY slow;
slow general master_heartbeat_period slow slow general master_heartbeat_period ignore_server_ids
1 2 3 1 1 2 3 4
1 2 3 1 1 2 3 NULL
1 2 NULL 1 1 2 NULL NULL
1 NULL NULL 1 1 NULL NULL NULL
5 6 7 5 5 6 7 8
5 6 7 5 5 6 7 NULL
5 6 NULL 5 5 6 NULL NULL
5 NULL NULL 5 5 NULL NULL NULL
SELECT slow, general, master_heartbeat_period FROM general ORDER BY slow; SELECT slow, general, master_heartbeat_period FROM general ORDER BY slow;
slow general master_heartbeat_period slow general master_heartbeat_period
1 2 3 1 2 3
...@@ -142,16 +142,16 @@ INSERT INTO master_heartbeat_period(slow, general, master_heartbeat_period, igno ...@@ -142,16 +142,16 @@ INSERT INTO master_heartbeat_period(slow, general, master_heartbeat_period, igno
INSERT INTO master_heartbeat_period(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7); INSERT INTO master_heartbeat_period(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7);
INSERT INTO master_heartbeat_period(slow, general) VALUES (1,2), (5,6); INSERT INTO master_heartbeat_period(slow, general) VALUES (1,2), (5,6);
INSERT INTO master_heartbeat_period(slow) VALUES (1), (5); INSERT INTO master_heartbeat_period(slow) VALUES (1), (5);
SELECT slow, general, master_heartbeat_period, slow FROM master_heartbeat_period ORDER BY slow; SELECT slow, general, master_heartbeat_period, ignore_server_ids FROM master_heartbeat_period ORDER BY slow;
slow general master_heartbeat_period slow slow general master_heartbeat_period ignore_server_ids
1 2 3 1 1 2 3 4
1 2 3 1 1 2 3 NULL
1 2 NULL 1 1 2 NULL NULL
1 NULL NULL 1 1 NULL NULL NULL
5 6 7 5 5 6 7 8
5 6 7 5 5 6 7 NULL
5 6 NULL 5 5 6 NULL NULL
5 NULL NULL 5 5 NULL NULL NULL
SELECT slow, general, master_heartbeat_period FROM master_heartbeat_period ORDER BY slow; SELECT slow, general, master_heartbeat_period FROM master_heartbeat_period ORDER BY slow;
slow general master_heartbeat_period slow general master_heartbeat_period
1 2 3 1 2 3
...@@ -188,16 +188,16 @@ INSERT INTO ignore_server_ids(slow, general, master_heartbeat_period, ignore_ser ...@@ -188,16 +188,16 @@ INSERT INTO ignore_server_ids(slow, general, master_heartbeat_period, ignore_ser
INSERT INTO ignore_server_ids(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7); INSERT INTO ignore_server_ids(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7);
INSERT INTO ignore_server_ids(slow, general) VALUES (1,2), (5,6); INSERT INTO ignore_server_ids(slow, general) VALUES (1,2), (5,6);
INSERT INTO ignore_server_ids(slow) VALUES (1), (5); INSERT INTO ignore_server_ids(slow) VALUES (1), (5);
SELECT slow, general, master_heartbeat_period, slow FROM ignore_server_ids ORDER BY slow; SELECT slow, general, master_heartbeat_period, ignore_server_ids FROM ignore_server_ids ORDER BY slow;
slow general master_heartbeat_period slow slow general master_heartbeat_period ignore_server_ids
1 2 3 1 1 2 3 4
1 2 3 1 1 2 3 NULL
1 2 NULL 1 1 2 NULL NULL
1 NULL NULL 1 1 NULL NULL NULL
5 6 7 5 5 6 7 8
5 6 7 5 5 6 7 NULL
5 6 NULL 5 5 6 NULL NULL
5 NULL NULL 5 5 NULL NULL NULL
SELECT slow, general, master_heartbeat_period FROM ignore_server_ids ORDER BY slow; SELECT slow, general, master_heartbeat_period FROM ignore_server_ids ORDER BY slow;
slow general master_heartbeat_period slow general master_heartbeat_period
1 2 3 1 2 3
......
mysql-test/t/keywords.test
View file @ aafb35d0
...@@ -78,7 +78,7 @@ INSERT INTO slow(slow, general, master_heartbeat_period, ignore_server_ids) VALU ...@@ -78,7 +78,7 @@ INSERT INTO slow(slow, general, master_heartbeat_period, ignore_server_ids) VALU
INSERT INTO slow(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7); INSERT INTO slow(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7);
INSERT INTO slow(slow, general) VALUES (1,2), (5,6); INSERT INTO slow(slow, general) VALUES (1,2), (5,6);
INSERT INTO slow(slow) VALUES (1), (5); INSERT INTO slow(slow) VALUES (1), (5);
SELECT slow, general, master_heartbeat_period, slow FROM slow ORDER BY slow; SELECT slow, general, master_heartbeat_period, ignore_server_ids FROM slow ORDER BY slow;
SELECT slow, general, master_heartbeat_period FROM slow ORDER BY slow; SELECT slow, general, master_heartbeat_period FROM slow ORDER BY slow;
SELECT slow, master_heartbeat_period FROM slow ORDER BY slow; SELECT slow, master_heartbeat_period FROM slow ORDER BY slow;
SELECT slow FROM slow ORDER BY slow; SELECT slow FROM slow ORDER BY slow;
...@@ -88,7 +88,7 @@ INSERT INTO general(slow, general, master_heartbeat_period, ignore_server_ids) V ...@@ -88,7 +88,7 @@ INSERT INTO general(slow, general, master_heartbeat_period, ignore_server_ids) V
INSERT INTO general(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7); INSERT INTO general(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7);
INSERT INTO general(slow, general) VALUES (1,2), (5,6); INSERT INTO general(slow, general) VALUES (1,2), (5,6);
INSERT INTO general(slow) VALUES (1), (5); INSERT INTO general(slow) VALUES (1), (5);
SELECT slow, general, master_heartbeat_period, slow FROM general ORDER BY slow; SELECT slow, general, master_heartbeat_period, ignore_server_ids FROM general ORDER BY slow;
SELECT slow, general, master_heartbeat_period FROM general ORDER BY slow; SELECT slow, general, master_heartbeat_period FROM general ORDER BY slow;
SELECT slow, master_heartbeat_period FROM general ORDER BY slow; SELECT slow, master_heartbeat_period FROM general ORDER BY slow;
SELECT slow FROM general ORDER BY slow; SELECT slow FROM general ORDER BY slow;
...@@ -98,7 +98,7 @@ INSERT INTO master_heartbeat_period(slow, general, master_heartbeat_period, igno ...@@ -98,7 +98,7 @@ INSERT INTO master_heartbeat_period(slow, general, master_heartbeat_period, igno
INSERT INTO master_heartbeat_period(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7); INSERT INTO master_heartbeat_period(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7);
INSERT INTO master_heartbeat_period(slow, general) VALUES (1,2), (5,6); INSERT INTO master_heartbeat_period(slow, general) VALUES (1,2), (5,6);
INSERT INTO master_heartbeat_period(slow) VALUES (1), (5); INSERT INTO master_heartbeat_period(slow) VALUES (1), (5);
SELECT slow, general, master_heartbeat_period, slow FROM master_heartbeat_period ORDER BY slow; SELECT slow, general, master_heartbeat_period, ignore_server_ids FROM master_heartbeat_period ORDER BY slow;
SELECT slow, general, master_heartbeat_period FROM master_heartbeat_period ORDER BY slow; SELECT slow, general, master_heartbeat_period FROM master_heartbeat_period ORDER BY slow;
SELECT slow, master_heartbeat_period FROM master_heartbeat_period ORDER BY slow; SELECT slow, master_heartbeat_period FROM master_heartbeat_period ORDER BY slow;
SELECT slow FROM master_heartbeat_period ORDER BY slow; SELECT slow FROM master_heartbeat_period ORDER BY slow;
...@@ -108,7 +108,7 @@ INSERT INTO ignore_server_ids(slow, general, master_heartbeat_period, ignore_ser ...@@ -108,7 +108,7 @@ INSERT INTO ignore_server_ids(slow, general, master_heartbeat_period, ignore_ser
INSERT INTO ignore_server_ids(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7); INSERT INTO ignore_server_ids(slow, general, master_heartbeat_period) VALUES (1,2,3), (5,6,7);
INSERT INTO ignore_server_ids(slow, general) VALUES (1,2), (5,6); INSERT INTO ignore_server_ids(slow, general) VALUES (1,2), (5,6);
INSERT INTO ignore_server_ids(slow) VALUES (1), (5); INSERT INTO ignore_server_ids(slow) VALUES (1), (5);
SELECT slow, general, master_heartbeat_period, slow FROM ignore_server_ids ORDER BY slow; SELECT slow, general, master_heartbeat_period, ignore_server_ids FROM ignore_server_ids ORDER BY slow;
SELECT slow, general, master_heartbeat_period FROM ignore_server_ids ORDER BY slow; SELECT slow, general, master_heartbeat_period FROM ignore_server_ids ORDER BY slow;
SELECT slow, master_heartbeat_period FROM ignore_server_ids ORDER BY slow; SELECT slow, master_heartbeat_period FROM ignore_server_ids ORDER BY slow;
SELECT slow FROM ignore_server_ids ORDER BY slow; SELECT slow FROM ignore_server_ids ORDER BY slow;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7