diff options
| author | Lena Startseva <lena.startseva@mariadb.com> | 2022-09-26 10:24:59 +0700 |
|---|---|---|
| committer | Lena Startseva <lena.startseva@mariadb.com> | 2022-09-26 10:24:59 +0700 |
| commit | d444536e1dbb0fef7a798b23382711c0448ab784 (patch) | |
| tree | b168bf07bca3ba94f42b8c8b31af675301600aca /mysql-test/main/ps_1general.test | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| parent | 184e65954b88266bd426de1c82973bf54a88afb1 (diff) | |
| download | mariadb-git-d444536e1dbb0fef7a798b23382711c0448ab784.tar.gz | |
Merge branch 'bb-10.4-all-builders' into bb-10.5-all-builders
Diffstat (limited to 'mysql-test/main/ps_1general.test')
| -rw-r--r-- | mysql-test/main/ps_1general.test | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/main/ps_1general.test b/mysql-test/main/ps_1general.test index 47db79cb6c6..b2785178e5b 100644 --- a/mysql-test/main/ps_1general.test +++ b/mysql-test/main/ps_1general.test @@ -469,7 +469,9 @@ prepare stmt1 from ' handler t1 open '; prepare stmt3 from ' commit ' ; prepare stmt3 from ' rollback ' ; - +# the view protocol has to use the same connection, +# not util connection +--disable_service_connection ## switch the sql_mode prepare stmt4 from ' SET sql_mode=ansi '; execute stmt4; @@ -486,6 +488,7 @@ execute stmt5; SET sql_mode=ansi; execute stmt5; SET sql_mode=""; +--enable_service_connection prepare stmt1 from ' flush local privileges ' ; prepare stmt1 from ' reset query cache ' ; |