1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge 10.6 into 10.11

This commit is contained in:
Marko Mäkelä
2023-11-30 13:03:59 +02:00
33 changed files with 378 additions and 190 deletions

View File

@@ -68,7 +68,7 @@ usage() if ($opt_help); # the help function
if ($opt_host =~ s/:(\d+)$//)
{
$opt_port = $1;
$opt_port = $1;
}
if ($opt_host eq '')
@@ -98,7 +98,7 @@ my $prefix= 'mysql';
if (eval {DBI->install_driver("MariaDB")}) {
$dsn ="DBI:MariaDB:;";
$prefix= 'mariadb';
}
}
else {
$dsn = "DBI:mysql:;";
}
@@ -226,11 +226,11 @@ sub setpwd
{
$pass = "PASSWORD(". $dbh->quote($pass) . ")";
}
my $uh= "$user@$host";
my $uh= $user."@".$host;
my $sth = $dbh->prepare("set password for $uh =$pass") || die $dbh->errstr;
$sth->execute || die $dbh->errstr;
$sth->finish;
print "The password is set for user $user.\n\n";
print "The password is set for user $uh.\n\n";
}