Skip to content

Commit 6ffe9ad

Browse files
dr-mdr-m
committed
Merge 10.9 into 10.10
2 parents cae5a03 + 5d5735c commit 6ffe9ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1867
-695
lines changed

‎mysql-test/main/cache_temporal_4265.result

+18
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,21 @@ select (select max(m2.ut) from t1 m2 where m1.id <> 0) from t1 m1;
2020
2001-01-01 00:00:00.200000
2121
2001-01-01 00:00:00.200000
2222
drop table t1;
23+
#
24+
# MDEV-30345 DML does not find rows it is supposed to
25+
#
26+
CREATE TABLE t1 (f timestamp);
27+
INSERT INTO t1 VALUES ('2022-01-01 00:00:00'),('2022-12-12 12:12:12');
28+
CREATE TABLE t2 (f timestamp);
29+
INSERT INTO t2 VALUES ('2022-01-01 00:00:00'),('2022-12-12 12:12:12');
30+
SELECT * FROM t2 WHERE f IN ( SELECT f FROM t1 ) ;
31+
f
32+
2022-01-01 00:00:00
33+
2022-12-12 12:12:12
34+
DELETE FROM t2 WHERE f IN ( SELECT f FROM t1 ) ;
35+
SELECT * FROM t2 WHERE f IN ( SELECT f FROM t1 ) ;
36+
f
37+
DROP TABLE t1,t2;
38+
#
39+
# End of 10.4 tests
40+
#

‎mysql-test/main/cache_temporal_4265.test

+18
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,21 @@ select * from t1;
2020
select (select max(m2.ut) from t1 m2 where m1.id <> 0) from t1 m1;
2121
drop table t1;
2222

23+
--echo #
24+
--echo # MDEV-30345 DML does not find rows it is supposed to
25+
--echo #
26+
27+
CREATE TABLE t1 (f timestamp);
28+
INSERT INTO t1 VALUES ('2022-01-01 00:00:00'),('2022-12-12 12:12:12');
29+
30+
CREATE TABLE t2 (f timestamp);
31+
INSERT INTO t2 VALUES ('2022-01-01 00:00:00'),('2022-12-12 12:12:12');
32+
33+
SELECT * FROM t2 WHERE f IN ( SELECT f FROM t1 ) ;
34+
DELETE FROM t2 WHERE f IN ( SELECT f FROM t1 ) ;
35+
SELECT * FROM t2 WHERE f IN ( SELECT f FROM t1 ) ;
36+
DROP TABLE t1,t2;
37+
38+
--echo #
39+
--echo # End of 10.4 tests
40+
--echo #

‎mysql-test/main/create.result

+11
Original file line numberDiff line numberDiff line change
@@ -2028,6 +2028,17 @@ Warnings:
20282028
Warning 1280 Name 'foo' ignored for PRIMARY key.
20292029
DROP TABLE t1;
20302030
#
2031+
# MDEV-30342 Wrong "Truncated incorrect DECIMAL value" warning/error
2032+
#
2033+
create table t1(c1 varchar(1));
2034+
insert into t1(c1) values('#');
2035+
select @@sql_mode like '%strict_all_tables%';
2036+
@@sql_mode like '%strict_all_tables%'
2037+
0
2038+
create table t2 as select if(c1 = '#', c1 = 0, c1) as c1 from t1;
2039+
ERROR 22007: Truncated incorrect DECIMAL value: '#'
2040+
drop table t1;
2041+
#
20312042
# End of 10.3 tests
20322043
#
20332044
#

‎mysql-test/main/create.test

+13
Original file line numberDiff line numberDiff line change
@@ -1892,6 +1892,19 @@ create table t1 (c int(10) unsigned) engine=memory transactional=0;
18921892
CREATE TABLE t1 ( id1 INT, id2 INT, CONSTRAINT `foo` PRIMARY KEY (id1), CONSTRAINT `bar` UNIQUE KEY(id2));
18931893
DROP TABLE t1;
18941894

1895+
--echo #
1896+
--echo # MDEV-30342 Wrong "Truncated incorrect DECIMAL value" warning/error
1897+
--echo #
1898+
1899+
create table t1(c1 varchar(1));
1900+
insert into t1(c1) values('#');
1901+
1902+
select @@sql_mode like '%strict_all_tables%';
1903+
--error ER_TRUNCATED_WRONG_VALUE
1904+
create table t2 as select if(c1 = '#', c1 = 0, c1) as c1 from t1;
1905+
1906+
drop table t1;
1907+
18951908
--echo #
18961909
--echo # End of 10.3 tests
18971910
--echo #

‎mysql-test/main/default.result

+21
Original file line numberDiff line numberDiff line change
@@ -3463,5 +3463,26 @@ SELECT 1 FROM t1 GROUP BY DEFAULT(pk);
34633463
1
34643464
DROP TABLE t1;
34653465
#
3466+
# MDEV-29890 Update with inner join false row count result
3467+
#
3468+
create table t1 (a int not null);
3469+
select column_name, column_default, column_default is not null as 'has_default', is_nullable from information_schema.columns where table_schema='test' and table_name='t1';
3470+
column_name column_default has_default is_nullable
3471+
a NULL 0 NO
3472+
create or replace view v1 as select * from t1;
3473+
select column_name, column_default, column_default is not null as 'has_default', is_nullable from information_schema.columns where table_schema='test' and table_name='v1';
3474+
column_name column_default has_default is_nullable
3475+
a NULL 0 NO
3476+
create or replace view v1 as select * from t1 group by a;
3477+
select column_name, column_default, column_default is not null as 'has_default', is_nullable from information_schema.columns where table_schema='test' and table_name='v1';
3478+
column_name column_default has_default is_nullable
3479+
a NULL 0 NO
3480+
create or replace view v1 as select * from t1 group by a with rollup;
3481+
select column_name, column_default, column_default is not null as 'has_default', is_nullable from information_schema.columns where table_schema='test' and table_name='v1';
3482+
column_name column_default has_default is_nullable
3483+
a NULL 1 YES
3484+
drop view v1;
3485+
drop table t1;
3486+
#
34663487
# End of 10.4 test
34673488
#

‎mysql-test/main/default.test

+14
Original file line numberDiff line numberDiff line change
@@ -2169,6 +2169,20 @@ INSERT INTO t1 VALUES (),();
21692169
SELECT 1 FROM t1 GROUP BY DEFAULT(pk);
21702170
DROP TABLE t1;
21712171

2172+
--echo #
2173+
--echo # MDEV-29890 Update with inner join false row count result
2174+
--echo #
2175+
create table t1 (a int not null);
2176+
select column_name, column_default, column_default is not null as 'has_default', is_nullable from information_schema.columns where table_schema='test' and table_name='t1';
2177+
create or replace view v1 as select * from t1;
2178+
select column_name, column_default, column_default is not null as 'has_default', is_nullable from information_schema.columns where table_schema='test' and table_name='v1';
2179+
create or replace view v1 as select * from t1 group by a;
2180+
select column_name, column_default, column_default is not null as 'has_default', is_nullable from information_schema.columns where table_schema='test' and table_name='v1';
2181+
create or replace view v1 as select * from t1 group by a with rollup;
2182+
select column_name, column_default, column_default is not null as 'has_default', is_nullable from information_schema.columns where table_schema='test' and table_name='v1';
2183+
drop view v1;
2184+
drop table t1;
2185+
21722186
--echo #
21732187
--echo # End of 10.4 test
21742188
--echo #

‎mysql-test/main/desc_index_range.result

+5-23
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
1111
from information_schema.optimizer_trace;
1212
json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
1313
[
14-
1514
[
1615
"(6) <= (a DESC) <= (6)",
1716
"(4) <= (a DESC) <= (4)",
@@ -43,10 +42,7 @@ select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
4342
from information_schema.optimizer_trace;
4443
json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
4544
[
46-
47-
[
48-
"(8) <= (a)"
49-
]
45+
["(8) <= (a)"]
5046
]
5147
explain select * from t1 force index(ab) where a>=8 and b<=50;
5248
id select_type table type possible_keys key key_len ref rows Extra
@@ -55,10 +51,7 @@ select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
5551
from information_schema.optimizer_trace;
5652
json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
5753
[
58-
59-
[
60-
"(8,50) <= (a,b DESC)"
61-
]
54+
["(8,50) <= (a,b DESC)"]
6255
]
6356
select * from t1 force index(ab) where a>=8 and b<=50;
6457
a b
@@ -102,10 +95,7 @@ select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
10295
from information_schema.optimizer_trace;
10396
json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
10497
[
105-
106-
[
107-
"(2,80) <= (a,b DESC) <= (4,50)"
108-
]
98+
["(2,80) <= (a,b DESC) <= (4,50)"]
10999
]
110100
select * from t1 where a between 2 and 4 and b between 50 and 80;
111101
a b
@@ -136,10 +126,7 @@ select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
136126
from information_schema.optimizer_trace;
137127
json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
138128
[
139-
140-
[
141-
"(4) <= (a DESC) <= (2)"
142-
]
129+
["(4) <= (a DESC) <= (2)"]
143130
]
144131
explain
145132
select * from t2 where a between 2 and 4 and b between 50 and 80;
@@ -149,10 +136,7 @@ select json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
149136
from information_schema.optimizer_trace;
150137
json_detailed(json_extract(trace, '$**.range_access_plan.ranges'))
151138
[
152-
153-
[
154-
"(4,80) <= (a DESC,b DESC) <= (2,50)"
155-
]
139+
["(4,80) <= (a DESC,b DESC) <= (2,50)"]
156140
]
157141
drop table t2;
158142
#
@@ -167,9 +151,7 @@ select json_detailed(json_extract(trace, '$**.potential_group_range_indexes'))
167151
from information_schema.optimizer_trace;
168152
json_detailed(json_extract(trace, '$**.potential_group_range_indexes'))
169153
[
170-
171154
[
172-
173155
{
174156
"index": "PRIMARY",
175157
"usable": false,

‎mysql-test/main/func_group.result

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
drop table if exists t1,t2,t3,t4,t5,t6;
21
set @sav_dpi= @@div_precision_increment;
32
set div_precision_increment= 5;
43
show variables like 'div_precision_increment';
@@ -2567,5 +2566,15 @@ stddev_samp(i) stddev_pop(i) stddev(i) std(i)
25672566
drop view v1;
25682567
drop table t1;
25692568
#
2569+
# MDEV-29988: Major performance regression with 10.6.11
2570+
#
2571+
create table t1 (a varchar(10) charset utf8mb4, b int, c int);
2572+
insert t1 values (1,2,3),(4,5,6),(1,7,8);
2573+
select concat(a,":",group_concat(b)) from t1 group by a;
2574+
concat(a,":",group_concat(b))
2575+
1:2,7
2576+
4:5
2577+
drop table t1;
2578+
#
25702579
# End of 10.3 tests
25712580
#

‎mysql-test/main/func_group.test

+8-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ if (`SELECT $PS_PROTOCOL != 0`)
66
--skip Test temporarily disabled for ps-protocol
77
}
88

9-
--disable_warnings
10-
drop table if exists t1,t2,t3,t4,t5,t6;
11-
--enable_warnings
12-
139
set @sav_dpi= @@div_precision_increment;
1410
set div_precision_increment= 5;
1511
show variables like 'div_precision_increment';
@@ -1807,6 +1803,14 @@ select * from v1;
18071803
drop view v1;
18081804
drop table t1;
18091805

1806+
--echo #
1807+
--echo # MDEV-29988: Major performance regression with 10.6.11
1808+
--echo #
1809+
create table t1 (a varchar(10) charset utf8mb4, b int, c int);
1810+
insert t1 values (1,2,3),(4,5,6),(1,7,8);
1811+
select concat(a,":",group_concat(b)) from t1 group by a;
1812+
drop table t1;
1813+
18101814
--echo #
18111815
--echo # End of 10.3 tests
18121816
--echo #

0 commit comments

Comments
 (0)