Skip to content

Commit 090cecd

Browse files
MDEV-31933: Make working view-protocol + ps-protocol (running two protocols together)
Fix for v. 10.5
1 parent d046b13 commit 090cecd

11 files changed

+139
-1
lines changed

mysql-test/main/distinct_notembedded.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
--echo # MDEV-30660 COUNT DISTINCT seems unnecessarily slow when run on a PK
77
--echo #
88

9+
#Enable after fix MDEV-32034
10+
--disable_view_protocol
911
set @save_optimizer_trace = @@optimizer_trace;
1012
SET optimizer_trace='enabled=on';
1113
let $trace=
@@ -104,6 +106,8 @@ eval $trace;
104106
DROP TABLE t1, t2, t3;
105107
DROP VIEW v1;
106108
SET optimizer_trace = @save_optimizer_trace;
109+
--enable_view_protocol
110+
107111
--echo #
108112
--echo # end of 10.5 tests
109113
--echo #

mysql-test/main/group_min_max_notembedded.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ SET
2323

2424
SELECT DISTINCT * FROM t1 WHERE a IN (1, 2);
2525

26+
#Enable after fix MDEV-32034
27+
--disable_view_protocol
2628
select
2729
CAST(json_value(json_extract(trace, '$**.chosen_access_method.cost'), '$[0]')
2830
as DOUBLE) < 1.0e100 as ACCESS_METHOD_COST_IS_FINITE
2931
from information_schema.optimizer_trace;
32+
--enable_view_protocol
3033

3134
set optimizer_use_condition_selectivity = @tmp, optimizer_trace=@tmp2;
3235
drop table t1;

mysql-test/main/having.test

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ where t1.col2 in
258258

259259
# the having column is resolved in the FROM clause of the outer query -
260260
# works in ANSI
261+
#Enable after fix MDEV-31937
262+
--disable_ps2_protocol
261263
select t1.col1 from t1
262264
where t1.col2 in
263265
(select t2.col2 from t2
@@ -284,6 +286,7 @@ where t1.col2 in
284286
group by t2.col1, t2.col2 having col_t1 <= 10)
285287
group by col_t1
286288
having col_t1 <= 20;
289+
--enable_ps2_protocol
287290

288291
#
289292
# nested HAVING clauses
@@ -412,11 +415,14 @@ INSERT INTO PROJ VALUES ('P4','SDP','Design',20000,'Deale');
412415
INSERT INTO PROJ VALUES ('P5','IRM','Test',10000,'Vienna');
413416
INSERT INTO PROJ VALUES ('P6','PAYR','Design',50000,'Deale');
414417

418+
#Enable after fix MDEV-31937
419+
--disable_ps2_protocol
415420
SELECT EMPNUM, GRADE*1000
416421
FROM HU.STAFF WHERE GRADE * 1000 >
417422
ANY (SELECT SUM(BUDGET) FROM HU.PROJ
418423
GROUP BY CITY, PTYPE
419424
HAVING HU.PROJ.CITY = HU.STAFF.CITY);
425+
--enable_ps2_protocol
420426

421427
DROP SCHEMA HU;
422428
USE test;
@@ -956,6 +962,8 @@ DROP TABLE t;
956962
--echo # MDEV-29731 Crash when HAVING in a correlated subquery references
957963
--echo # columns in the outer query
958964
--echo #
965+
#Enable after fix MDEV-29731
966+
--disable_view_protocol
959967
CREATE TABLE t (a INT, b INT);
960968
SELECT 1 FROM t
961969
WHERE b = (SELECT 1 FROM t GROUP BY a HAVING b = a+1);
@@ -998,6 +1006,7 @@ UPDATE t SET a = ''
9981006
WHERE (0, a) IN ((0,-1),(+1,0))
9991007
ORDER BY 1+AVG(a) OVER (ORDER BY a)) ORDER BY a;
10001008
DROP TABLE t;
1009+
--enable_view_protocol
10011010

10021011
--echo #
10031012
--echo # End of 10.4 tests

0 commit comments

Comments
 (0)