Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä
2020-05-28 09:01:49 +03:00
5 changed files with 5 additions and 59 deletions

View File

@ -1252,16 +1252,10 @@ int Mariadb_nodes::configure_ssl(bool require)
int Mariadb_nodes::disable_ssl()
{
int local_result = 0;
char str[1024];
local_result += connect();
sprintf(str,
"DROP USER %s; grant all privileges on *.* to '%s'@'%%' identified by '%s';",
user_name,
user_name,
password);
local_result += execute_query(nodes[0], "%s", "");
int local_result = connect();
local_result += execute_query(
nodes[0], "DROP USER %s; grant all privileges on *.* to '%s'@'%%' identified by '%s';",
user_name, user_name, password);
close_connections();
for (int i = 0; i < N; i++)