Skip to content

M
MariaDB
Commit 02585b60 authored by Mattias Jonsson's avatar Mattias Jonsson
Browse files
Options

post push fix for bug#20577 and bug#46362, disabling warnings

parent 35ba36d1
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 4 deletions
mysql-test/include/partition_date_range.inc
View file @ 02585b60
...@@ -21,6 +21,8 @@ SELECT * FROM t1 WHERE a >= '1001-00-00'; ...@@ -21,6 +21,8 @@ SELECT * FROM t1 WHERE a >= '1001-00-00';
SELECT * FROM t1 WHERE a > '1001-00-00'; SELECT * FROM t1 WHERE a > '1001-00-00';
--sorted_result --sorted_result
SELECT * FROM t1 WHERE a = '1001-00-00'; SELECT * FROM t1 WHERE a = '1001-00-00';
--echo # Disabling warnings for the invalid date
--disable_warnings
--sorted_result --sorted_result
SELECT * FROM t1 WHERE a < '1999-02-31'; SELECT * FROM t1 WHERE a < '1999-02-31';
--sorted_result --sorted_result
...@@ -31,6 +33,7 @@ SELECT * FROM t1 WHERE a >= '1999-02-31'; ...@@ -31,6 +33,7 @@ SELECT * FROM t1 WHERE a >= '1999-02-31';
SELECT * FROM t1 WHERE a > '1999-02-31'; SELECT * FROM t1 WHERE a > '1999-02-31';
--sorted_result --sorted_result
SELECT * FROM t1 WHERE a = '1999-02-31'; SELECT * FROM t1 WHERE a = '1999-02-31';
--enable_warnings
--sorted_result --sorted_result
SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00'; SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00';
--sorted_result --sorted_result
...@@ -51,11 +54,14 @@ EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a <= '1001-00-00'; ...@@ -51,11 +54,14 @@ EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a <= '1001-00-00';
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a >= '1001-00-00'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a >= '1001-00-00';
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a > '1001-00-00'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a > '1001-00-00';
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
--echo # Disabling warnings for the invalid date
--disable_warnings
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a <= '1999-02-31'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a <= '1999-02-31';
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a >= '1999-02-31'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a >= '1999-02-31';
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a > '1999-02-31'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a > '1999-02-31';
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1999-02-31'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1999-02-31';
--enable_warnings
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00';
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1001-01-01'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1001-01-01';
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a BETWEEN '0001-01-02' AND '1002-00-00'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a BETWEEN '0001-01-02' AND '1002-00-00';
......
mysql-test/r/partition_pruning.result
View file @ 02585b60
...@@ -58,6 +58,7 @@ a ...@@ -58,6 +58,7 @@ a
SELECT * FROM t1 WHERE a = '1001-00-00'; SELECT * FROM t1 WHERE a = '1001-00-00';
a a
1001-00-00 1001-00-00
# Disabling warnings for the invalid date
SELECT * FROM t1 WHERE a < '1999-02-31'; SELECT * FROM t1 WHERE a < '1999-02-31';
a a
0000-00-00 0000-00-00
...@@ -82,8 +83,6 @@ a ...@@ -82,8 +83,6 @@ a
2001-01-01 2001-01-01
SELECT * FROM t1 WHERE a = '1999-02-31'; SELECT * FROM t1 WHERE a = '1999-02-31';
a a
Warning 1292 Incorrect date value: '1999-02-31' for column 'a' at row 1
Warnings:
SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00'; SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00';
a a
0000-00-00 0000-00-00
...@@ -139,6 +138,7 @@ id select_type table partitions type possible_keys key key_len ref rows Extra ...@@ -139,6 +138,7 @@ id select_type table partitions type possible_keys key key_len ref rows Extra
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
id select_type table partitions type possible_keys key key_len ref rows Extra id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 pNULL ref a a 4 const 1 Using where; Using index 1 SIMPLE t1 pNULL ref a a 4 const 1 Using where; Using index
# Disabling warnings for the invalid date
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
id select_type table partitions type possible_keys key key_len ref rows Extra id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 pNULL,p0001-01-01,p1001-01-01,p2001-01-01 range a a 4 NULL 5 Using where; Using index 1 SIMPLE t1 pNULL,p0001-01-01,p1001-01-01,p2001-01-01 range a a 4 NULL 5 Using where; Using index
...@@ -218,6 +218,7 @@ a ...@@ -218,6 +218,7 @@ a
SELECT * FROM t1 WHERE a = '1001-00-00'; SELECT * FROM t1 WHERE a = '1001-00-00';
a a
1001-00-00 1001-00-00
# Disabling warnings for the invalid date
SELECT * FROM t1 WHERE a < '1999-02-31'; SELECT * FROM t1 WHERE a < '1999-02-31';
a a
0000-00-00 0000-00-00
...@@ -297,6 +298,7 @@ id select_type table partitions type possible_keys key key_len ref rows Extra ...@@ -297,6 +298,7 @@ id select_type table partitions type possible_keys key key_len ref rows Extra
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
id select_type table partitions type possible_keys key key_len ref rows Extra id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 pNULL ALL NULL NULL NULL NULL 7 Using where 1 SIMPLE t1 pNULL ALL NULL NULL NULL NULL 7 Using where
# Disabling warnings for the invalid date
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
id select_type table partitions type possible_keys key key_len ref rows Extra id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 pNULL,p0001-01-01,p1001-01-01,p2001-01-01 ALL NULL NULL NULL NULL 7 Using where 1 SIMPLE t1 pNULL,p0001-01-01,p1001-01-01,p2001-01-01 ALL NULL NULL NULL NULL 7 Using where
...@@ -385,6 +387,7 @@ a ...@@ -385,6 +387,7 @@ a
SELECT * FROM t1 WHERE a = '1001-00-00'; SELECT * FROM t1 WHERE a = '1001-00-00';
a a
1001-00-00 1001-00-00
# Disabling warnings for the invalid date
SELECT * FROM t1 WHERE a < '1999-02-31'; SELECT * FROM t1 WHERE a < '1999-02-31';
a a
0000-00-00 0000-00-00
...@@ -409,8 +412,6 @@ a ...@@ -409,8 +412,6 @@ a
2001-01-01 2001-01-01
SELECT * FROM t1 WHERE a = '1999-02-31'; SELECT * FROM t1 WHERE a = '1999-02-31';
a a
Warning 1292 Incorrect date value: '1999-02-31' for column 'a' at row 1
Warnings:
SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00'; SELECT * FROM t1 WHERE a BETWEEN '0000-00-00' AND '1002-00-00';
a a
0000-00-00 0000-00-00
...@@ -466,6 +467,7 @@ id select_type table partitions type possible_keys key key_len ref rows Extra ...@@ -466,6 +467,7 @@ id select_type table partitions type possible_keys key key_len ref rows Extra
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
id select_type table partitions type possible_keys key key_len ref rows Extra id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 pNULL ref a a 4 const 1 Using where; Using index 1 SIMPLE t1 pNULL ref a a 4 const 1 Using where; Using index
# Disabling warnings for the invalid date
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
id select_type table partitions type possible_keys key key_len ref rows Extra id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 p0001-01-01,pNULL,p0000-01-02,p1001-01-01 range a a 4 NULL 5 Using where; Using index 1 SIMPLE t1 p0001-01-01,pNULL,p0000-01-02,p1001-01-01 range a a 4 NULL 5 Using where; Using index
...@@ -545,6 +547,7 @@ a ...@@ -545,6 +547,7 @@ a
SELECT * FROM t1 WHERE a = '1001-00-00'; SELECT * FROM t1 WHERE a = '1001-00-00';
a a
1001-00-00 1001-00-00
# Disabling warnings for the invalid date
SELECT * FROM t1 WHERE a < '1999-02-31'; SELECT * FROM t1 WHERE a < '1999-02-31';
a a
0000-00-00 0000-00-00
...@@ -624,6 +627,7 @@ id select_type table partitions type possible_keys key key_len ref rows Extra ...@@ -624,6 +627,7 @@ id select_type table partitions type possible_keys key key_len ref rows Extra
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a = '1001-00-00';
id select_type table partitions type possible_keys key key_len ref rows Extra id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 pNULL ALL NULL NULL NULL NULL 7 Using where 1 SIMPLE t1 pNULL ALL NULL NULL NULL NULL 7 Using where
# Disabling warnings for the invalid date
EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31'; EXPLAIN PARTITIONS SELECT * FROM t1 WHERE a < '1999-02-31';
id select_type table partitions type possible_keys key key_len ref rows Extra id select_type table partitions type possible_keys key key_len ref rows Extra
1 SIMPLE t1 p0001-01-01,pNULL,p0000-01-02,p1001-01-01 ALL NULL NULL NULL NULL 7 Using where 1 SIMPLE t1 p0001-01-01,pNULL,p0000-01-02,p1001-01-01 ALL NULL NULL NULL NULL 7 Using where
......
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