Skip to content

Commit ad5b9c2

Browse files
MDEV-27944: View-protocol fails if database was changed
This is a limitation of the view protocol. Tests were fixed with workaround (via disable/enable service connection)
1 parent 53f5ee7 commit ad5b9c2

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

mysql-test/main/cte_nonrecursive.test

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,14 +1048,14 @@ drop table t1;
10481048
--echo # MDEV-16473: query with CTE when no database is set
10491049
--echo #
10501050

1051-
# Enable view protocol after fix MDEV-27944
1052-
--disable_view_protocol
10531051
create database db_mdev_16473;
10541052
use db_mdev_16473;
10551053
drop database db_mdev_16473;
10561054

1055+
--disable_service_connection
10571056
--echo # Now no default database is set
10581057
select database();
1058+
--enable_service_connection
10591059

10601060
with cte as (select 1 as a) select * from cte;
10611061

@@ -1073,7 +1073,6 @@ select * from cte, db_mdev_16473.t1 as t where cte.a=t.a;
10731073
drop database db_mdev_16473;
10741074

10751075
use test;
1076-
--enable_view_protocol
10771076

10781077
--echo #
10791078
--echo # MDEV-17154: using parameter markers for PS within CTEs more than once
@@ -1220,8 +1219,6 @@ DROP TABLE test.t;
12201219
--echo # MDEV-22781: create view with CTE without default database
12211220
--echo #
12221221

1223-
# Enable view protocol after fix MDEV-27944
1224-
--disable_view_protocol
12251222
create database db;
12261223
use db;
12271224
drop database db;
@@ -1231,7 +1228,9 @@ insert into db1.t1 values (3),(7),(1);
12311228

12321229
create view db1.v1 as with t as (select * from db1.t1) select * from t;
12331230
show create view db1.v1;
1231+
--disable_service_connection
12341232
select * from db1.v1;
1233+
--enable_service_connection
12351234
drop view db1.v1;
12361235

12371236
prepare stmt from "
@@ -1240,14 +1239,15 @@ create view db1.v1 as with t as (select * from db1.t1) select * from t;
12401239
execute stmt;
12411240
deallocate prepare stmt;
12421241
show create view db1.v1;
1242+
--disable_service_connection
12431243
select * from db1.v1;
1244+
--enable_service_connection
12441245
drop view db1.v1;
12451246

12461247
drop table db1.t1;
12471248
drop database db1;
12481249

12491250
use test;
1250-
--enable_view_protocol
12511251

12521252
--echo #
12531253
--echo # MDEV-24597: CTE with union used multiple times in query

mysql-test/main/ctype_recoding.test

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,12 @@ SHOW TABLES IN
7474
SET CHARACTER SET koi8r;
7575
DROP DATABASE ����;
7676

77-
# Enable view protocol after fix MDEV-27944
78-
--disable_view_protocol
77+
--disable_service_connection
7978
SET NAMES koi8r;
8079
SELECT hex('����');
8180
SET character_set_connection=cp1251;
8281
SELECT hex('����');
83-
--enable_view_protocol
82+
--enable_service_connection
8483
USE test;
8584

8685
# Bug#4417

mysql-test/main/lowercase_table.test

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
# Test of --lower-case-table-names
33
#
44

5-
#remove this include after fix MDEV-27944
6-
--source include/no_view_protocol.inc
7-
85
create table T1 (id int primary key, Word varchar(40) not null, Index(Word));
96
create table t4 (id int primary key, Word varchar(40) not null);
107
INSERT INTO T1 VALUES (1, 'a'), (2, 'b'), (3, 'c');
@@ -36,8 +33,10 @@ drop table t1;
3633
create database mysqltest;
3734
use MYSQLTEST;
3835
create table t1 (a int);
36+
--disable_service_connection
3937
select T1.a from MYSQLTEST.T1;
4038
select t1.a from MYSQLTEST.T1;
39+
--enable_service_connection
4140
select mysqltest.t1.* from MYSQLTEST.t1;
4241
select MYSQLTEST.t1.* from MYSQLTEST.t1;
4342
select MYSQLTEST.T1.* from MYSQLTEST.T1;

0 commit comments

Comments
 (0)