1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-25878: mytop bugs: check for mysql driver and sockets

Browse Source 
- Adding socket check for MariaDB/Mysql driver

Reviewed by: serg@mariadb.com
This commit is contained in:
Anel Husakovic 2020-10-13 14:36:25 +02:00
parent 59e3ac2e67
commit bcedb4200f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/mytop.sh
View File

@ -6,7 +6,7 @@
=head1 NAME =head1 NAME
mytop - display MariaDB server performance info like `top' mytop - display MariaDB/MySQL server performance info like `top'
=cut =cut
@ -241,16 +241,17 @@ my $BOLD = BOLD() || '';
my $dsn; my $dsn;
## Socket takes precedence. ## Socket takes precedence.
my $prefix= 'mysql';
if (eval {DBI->install_driver("MariaDB")}) { if (eval {DBI->install_driver("MariaDB")}) {
$dsn = "DBI:MariaDB:database=$config{db};mariadb_read_default_group=mytop;"; $dsn = "DBI:MariaDB:database=$config{db};mariadb_read_default_group=mytop;";
$prefix= 'mariadb'
} else { } else {
$dsn = "DBI:mysql:database=$config{db};mysql_read_default_group=mytop;"; $dsn = "DBI:mysql:database=$config{db};mysql_read_default_group=mytop;";
} }
if ($config{socket} and -S $config{socket}) if ($config{socket} and -S $config{socket})
{ {
$dsn .= "mariadb_socket=$config{socket}"; $dsn .= "${prefix}_socket=$config{socket}";
} }
else else
{ {
@ -272,7 +273,7 @@ my $dbh = DBI->connect($dsn, $config{user}, $config{pass},
if (not ref $dbh) if (not ref $dbh)
{ {
my $Error = <<EODIE my $Error = <<EODIE
Cannot connect to MariaDB server. Please check the: Cannot connect to MariaDB/MySQL server. Please check the:
* database you specified "$config{db}" (default is "") * database you specified "$config{db}" (default is "")
* username you specified "$config{user}" (default is "root") * username you specified "$config{user}" (default is "root")
@ -2284,8 +2285,8 @@ Default: unset.
=item B<-S> or B<--socket> I</path/to/socket> =item B<-S> or B<--socket> I</path/to/socket>
If you're running B<mytop> on the same host as MariaDB, you may wish to If you're running B<mytop> on the same host as MariaDB/MySQL, you may wish to
have it use the MariaDB socket directly rather than a standard TCP/IP have it use the MariaDB/MySQL socket directly rather than a standard TCP/IP
connection. If you do,just specify one. connection. If you do,just specify one.
Note that specifying a socket will make B<mytop> ignore any host Note that specifying a socket will make B<mytop> ignore any host