Skip to content

Commit 7ba32f3

Browse files
MDEV-24588, 36851 followup: Fix derived, hybrid func test for --view-protocol
1 parent fadfd9e commit 7ba32f3

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

mysql-test/main/derived.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,7 @@ drop table t1,t2,t3;
11941194

11951195
--echo # Tests from the bug report
11961196

1197+
--disable_view_protocol
11971198
CREATE TABLE t (pk INT PRIMARY KEY);
11981199
INSERT INTO t VALUES (1), (2), (3);
11991200

@@ -1248,6 +1249,7 @@ SHOW CREATE VIEW v1;
12481249

12491250
DROP VIEW v_t, v1;
12501251
DROP TABLE t;
1252+
--enable_view_protocol
12511253

12521254
--echo # Tests on views created using SELECT statements that contain derived columns
12531255

mysql-test/main/func_hybrid_type.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,19 +1212,23 @@ INSERT INTO t values (1, 2.3, 'four', '2025-05-06');
12121212

12131213
--enable_metadata
12141214
--disable_ps_protocol
1215+
--disable_view_protocol
12151216
SELECT COALESCE(c1, 10) AS coalesced_c1, IFNULL(c1, 10) AS ifnull_c1 FROM t;
12161217
SELECT COALESCE(c1, NULL) AS coalesced_c1, IFNULL(c1, NULL) AS ifnull_c1 FROM t;
12171218
SELECT COALESCE(c2, NULL) AS coalesced_c2, IFNULL(c2, NULL) as ifnull_c2 FROM t;
12181219
SELECT COALESCE(c3, 'two') as coalesced_c1, COALESCE(c4, '2025-07-08') AS coalesced_date FROM t;
1220+
--enable_view_protocol
12191221
--enable_ps_protocol
12201222
--disable_metadata
12211223

12221224
INSERT INTO t values (2, 3.4, NULL, NULL);
12231225
--enable_metadata
12241226
--disable_ps_protocol
1227+
--disable_view_protocol
12251228
SELECT COALESCE(c3, 'two') AS coalesced_c3, IFNULL(c3, 'three') AS ifnull_c3 FROM t WHERE c1 = 2;
12261229
SELECT COALESCE(c3, 'four', NULL) AS coalesced_c3, COALESCE(COALESCE(c3, NULL), NULL) AS coalesced_c3_null FROM t WHERE c1 = 2;
12271230
SELECT COALESCE(c4, COALESCE('2025-05-06', NULL)) AS coalesced_date FROM t WHERE c1 = 2;
1231+
--enable_view_protocol
12281232
--enable_ps_protocol
12291233
--disable_metadata
12301234

0 commit comments

Comments
 (0)