summaryrefslogtreecommitdiff
path: root/mysql-test/t/keywords.test
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@oracle.com>2010-11-05 08:23:39 +0000
committerLuis Soares <luis.soares@oracle.com>2010-11-05 08:23:39 +0000
commitaafb35d09975170b6162a9bcd3b2c35cdb78579d (patch)
tree9ed381d9fce2409e370a0fbc2dbf0938cadc5475 /mysql-test/t/keywords.test
parent1602ffb8ab4e04d17db995a22bb6c33a5a638881 (diff)
downloadmariadb-git-aafb35d09975170b6162a9bcd3b2c35cdb78579d.tar.gz
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".
Diffstat (limited to 'mysql-test/t/keywords.test')
-rw-r--r--mysql-test/t/keywords.test8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/keywords.test b/mysql-test/t/keywords.test
index 2681f786f40..08016313ca7 100644
--- a/mysql-test/t/keywords.test
+++ b/mysql-test/t/keywords.test
@@ -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) VALUES (1,2), (5,6);
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, master_heartbeat_period 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
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) 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, master_heartbeat_period 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
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) 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, master_heartbeat_period 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
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) 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, master_heartbeat_period FROM ignore_server_ids ORDER BY slow;
SELECT slow FROM ignore_server_ids ORDER BY slow;