summaryrefslogtreecommitdiff
path: root/mysql-test/t/partition_pruning.test
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2017-01-18 11:44:47 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2017-01-18 11:44:47 -0500
commita3a91332d006fd39a32e1f6d4663e11515ea944b (patch)
tree560c152c9f8146a4c1bcd52ad2a2fa454be48aec /mysql-test/t/partition_pruning.test
parent2805baf06c31dac21604148ec089300461790e3d (diff)
downloadmariadb-git-bb-10.2-mdev7635.final.tar.gz
MDEV-7635: Update tests to adapt to the new default sql_modebb-10.2-mdev7635.savedbb-10.2-mdev7635.final
Diffstat (limited to 'mysql-test/t/partition_pruning.test')
-rw-r--r--mysql-test/t/partition_pruning.test12
1 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/t/partition_pruning.test b/mysql-test/t/partition_pruning.test
index 9d72e9c0d01..8b9e736cf37 100644
--- a/mysql-test/t/partition_pruning.test
+++ b/mysql-test/t/partition_pruning.test
@@ -208,11 +208,13 @@ if ($verify_without_partitions)
{
ALTER TABLE t1 REMOVE PARTITIONING;
}
-INSERT INTO t1 VALUES ('0000-00-00'), ('0000-01-02'), ('0001-01-01'),
+INSERT IGNORE INTO t1 VALUES ('0000-00-00'), ('0000-01-02'), ('0001-01-01'),
('1001-00-00'), ('1001-01-01'), ('1002-00-00'), ('2001-01-01');
--source include/partition_date_range.inc
--echo # test without index
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
ALTER TABLE t1 DROP KEY a;
+SET sql_mode = DEFAULT;
--source include/partition_date_range.inc
DROP TABLE t1;
@@ -228,11 +230,13 @@ if ($verify_without_partitions)
{
ALTER TABLE t1 REMOVE PARTITIONING;
}
-INSERT INTO t1 VALUES ('0000-00-00'), ('0000-01-02'), ('0001-01-01'),
+INSERT IGNORE INTO t1 VALUES ('0000-00-00'), ('0000-01-02'), ('0001-01-01'),
('1001-00-00'), ('1001-01-01'), ('1002-00-00'), ('2001-01-01');
--source include/partition_date_range.inc
--echo # test without index
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
ALTER TABLE t1 DROP KEY a;
+SET sql_mode = DEFAULT;
--source include/partition_date_range.inc
DROP TABLE t1;
--echo # TO_SECONDS, test of LIST and index
@@ -247,11 +251,13 @@ if ($verify_without_partitions)
{
ALTER TABLE t1 REMOVE PARTITIONING;
}
-INSERT INTO t1 VALUES ('0000-00-00'), ('0000-01-02'), ('0001-01-01'),
+INSERT IGNORE INTO t1 VALUES ('0000-00-00'), ('0000-01-02'), ('0001-01-01'),
('1001-00-00'), ('1001-01-01'), ('1002-00-00'), ('2001-01-01');
--source include/partition_date_range.inc
--echo # test without index
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
ALTER TABLE t1 DROP KEY a;
+SET sql_mode = DEFAULT;
--source include/partition_date_range.inc
DROP TABLE t1;