From 7612693bbce2d242cbf4b28a02efae06bb85b590 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 24 Jul 2026 09:29:08 +1000 Subject: [PATCH] MDEV-40489: main.set_password view-protocol incompatibilities with auth=mysql_old_password:mysql_native_password, so disable sections. Remove two unneeded "flush privileges" from test. This is a connector 3.4 difference compared to 3.3 --- mysql-test/main/set_password.result | 2 -- mysql-test/main/set_password.test | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mysql-test/main/set_password.result b/mysql-test/main/set_password.result index 518d07490c173..e578339731d53 100644 --- a/mysql-test/main/set_password.result +++ b/mysql-test/main/set_password.result @@ -58,7 +58,6 @@ current_user() oldpassold@localhost disconnect con; connection default; -flush privileges; connect con,localhost,natauth,test,; select current_user(); current_user() @@ -140,7 +139,6 @@ current_user() oldpassold@localhost disconnect con; connection default; -flush privileges; connect con,localhost,natauth,test2,; select current_user(); current_user() diff --git a/mysql-test/main/set_password.test b/mysql-test/main/set_password.test index 9e65623153254..76dcb4872c234 100644 --- a/mysql-test/main/set_password.test +++ b/mysql-test/main/set_password.test @@ -45,6 +45,7 @@ select current_user(); --connect(con,localhost,newpassnat,test,) select current_user(); --disconnect con +--disable_view_protocol --connect(con,localhost,oldauth,test,,,,auth=mysql_old_password:mysql_native_password) select current_user(); --disconnect con @@ -54,11 +55,10 @@ select current_user(); --connect(con,localhost,oldpassold,test,,,,auth=mysql_old_password:mysql_native_password) select current_user(); --disconnect con +--enable_view_protocol --connection default -flush privileges; - --connect(con,localhost,natauth,test,) select current_user(); --disconnect con @@ -68,6 +68,7 @@ select current_user(); --connect(con,localhost,newpassnat,test,) select current_user(); --disconnect con +--disable_view_protocol --connect(con,localhost,oldauth,test,,,,auth=mysql_old_password:mysql_native_password) select current_user(); --disconnect con @@ -77,6 +78,7 @@ select current_user(); --connect(con,localhost,oldpassold,test,,,,auth=mysql_old_password:mysql_native_password) select current_user(); --disconnect con +--enable_view_protocol --connection default @@ -112,8 +114,6 @@ select current_user(); --connection default -flush privileges; - --connect(con,localhost,natauth,test2,) select current_user(); --disconnect con