Change MySQL -> MariaDB inc scripts
This commit is contained in:
Monty
parent
3bde13932e
commit
b4c74e2ab4
@ -234,8 +234,8 @@ set -e
|
||||
if test -f ./client/.libs/mysql
|
||||
then
|
||||
echo ""
|
||||
echo "The MySQL clients are compiled dynamicly, which is not allowed for"
|
||||
echo "a MySQL binary tar file. Please configure with"
|
||||
echo "The MariaDB clients are compiled dynamically, which is not allowed for"
|
||||
echo "a MariaDB binary tar file. Please configure with"
|
||||
echo "--with-client-ldflags=-all-static and try again"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
# This script reports various configuration settings that may be needed
|
||||
# when using the MySQL client library.
|
||||
# when using the MariaDB client library.
|
||||
|
||||
which ()
|
||||
{
|
||||
@ -39,7 +39,7 @@ which ()
|
||||
#
|
||||
# If we can find the given directory relatively to where mysql_config is
|
||||
# we should use this instead of the incompiled one.
|
||||
# This is to ensure that this script also works with the binary MySQL
|
||||
# This is to ensure that this script also works with the binary MariaDB
|
||||
# version
|
||||
|
||||
fix_path ()
|
||||
|
||||
@ -125,7 +125,7 @@ sub usage
|
||||
|
||||
print <<EOF;
|
||||
|
||||
Conversion of a MySQL tables to other storage engines
|
||||
Conversion of a MariaDB tables to other storage engines
|
||||
|
||||
Usage: $0 database [table[ table ...]]
|
||||
If no tables has been specifed, all tables in the database will be converted.
|
||||
|
||||
@ -131,7 +131,7 @@ $0 Ver $version
|
||||
|
||||
Prints all SQL queries that matches a regexp or contains a 'use
|
||||
database' or 'set ..' command to stdout. A SQL query may contain
|
||||
newlines. This is useful to find things in a MySQL update log.
|
||||
newlines. This is useful to find things in a MariaDB update log.
|
||||
|
||||
$0 takes the following options:
|
||||
|
||||
|
||||
@ -18,10 +18,10 @@
|
||||
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
|
||||
# MA 02110-1301, USA
|
||||
|
||||
# This is a utility for MySQL. It is not needed by any standard part
|
||||
# of MySQL.
|
||||
# This is a utility for MariaDB. It is not needed by any standard part
|
||||
# of MariaDB.
|
||||
|
||||
# Usage: mysql_fix_extentions datadir
|
||||
# Usage: mysql_fix_extensions datadir
|
||||
# does not work with RAID, with InnoDB or BDB tables
|
||||
# makes .frm lowercase and .MYI/MYD/ISM/ISD uppercase
|
||||
# useful when datafiles are copied from windows
|
||||
|
||||
@ -78,7 +78,7 @@ else
|
||||
if ($opt_password eq '')
|
||||
{
|
||||
system "stty -echo";
|
||||
print "Password for user $opt_user to connect to MySQL: ";
|
||||
print "Password for user $opt_user to connect to MariaDB: ";
|
||||
$opt_password = <STDIN>;
|
||||
chomp($opt_password);
|
||||
system "stty echo";
|
||||
@ -86,7 +86,7 @@ if ($opt_password eq '')
|
||||
}
|
||||
|
||||
|
||||
# make the connection to MySQL
|
||||
# make the connection to MariaDB
|
||||
$dbh= DBI->connect("DBI:mysql:mysql:host=$sqlhost:port=$opt_port:mysql_socket=$opt_socket",$opt_user,$opt_password, {PrintError => 0}) ||
|
||||
die("Can't make a connection to the mysql server.\n The error: $DBI::errstr");
|
||||
|
||||
@ -106,7 +106,7 @@ sub q1 { # first question ...
|
||||
while (! $end) {
|
||||
print "#"x70;
|
||||
print "\n";
|
||||
print "## Welcome to the permission setter $version for MySQL.\n";
|
||||
print "## Welcome to the permission setter $version for MariaDB.\n";
|
||||
print "## made by Luuk de Boer\n";
|
||||
print "#"x70;
|
||||
print "\n";
|
||||
@ -634,17 +634,17 @@ sub usage
|
||||
{
|
||||
print <<EOL;
|
||||
----------------------------------------------------------------------
|
||||
The permission setter for MySQL.
|
||||
The permission setter for MariaDB.
|
||||
version: $version
|
||||
|
||||
made by: Luuk de Boer <luuk\@wxs.nl>
|
||||
----------------------------------------------------------------------
|
||||
|
||||
The permission setter is a little program which can help you add users
|
||||
or databases or change passwords in MySQL. Keep in mind that we don't
|
||||
check permissions which already been set in MySQL. So if you can't
|
||||
connect to MySQL using the permission you just added, take a look at
|
||||
the permissions which have already been set in MySQL.
|
||||
or databases or change passwords in MariaDB. Keep in mind that we don't
|
||||
check permissions which already been set in MariaDB. So if you can't
|
||||
connect to MariaDB using the permission you just added, take a look at
|
||||
the permissions which have already been set in MariaDB.
|
||||
|
||||
The permission setter first reads your .my.cnf file in your Home
|
||||
directory if it exists.
|
||||
@ -653,7 +653,7 @@ Options for the permission setter:
|
||||
|
||||
--help : print this help message and exit.
|
||||
|
||||
The options shown below are used for making the connection to the MySQL
|
||||
The options shown below are used for making the connection to the MariaDB
|
||||
server. Keep in mind that the permissions for the user specified via
|
||||
these options must be sufficient to add users / create databases / set
|
||||
passwords.
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
# This is a utility for MySQL. It is not needed by any standard part
|
||||
# of MySQL.
|
||||
# This is a utility for MariaDB. It is not needed by any standard part
|
||||
# of MariaDB.
|
||||
|
||||
# Usage: mysql_zap [-signal] [-f] [-t] pattern
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ BEGIN {
|
||||
$script_log = $ENV{'HOME'}."/$script.log";
|
||||
|
||||
# ****************************
|
||||
# information on MySQL
|
||||
# information on MariaDB
|
||||
$MYSQL = '@bindir@/mysql'; # path to mysql executable
|
||||
$SERVER = '3.21';
|
||||
$MYSQL_OPT = ' --batch --unbuffered';
|
||||
@ -97,8 +97,8 @@ Usage: $script [host [user [db]]] OPTIONS
|
||||
|
||||
-U, --superuser=# connect as superuser
|
||||
-P, --spassword=# password for superuser
|
||||
-H, --rhost=# remote MySQL-server to connect to
|
||||
--old_server connect to old MySQL-server (before v3.21) which
|
||||
-H, --rhost=# remote MariaDB-server to connect to
|
||||
--old_server connect to old MariaDB-server (before v3.21) which
|
||||
does not yet know how to handle full where clauses.
|
||||
|
||||
-b, --brief single-line tabular report
|
||||
|
||||
@ -103,7 +103,7 @@ sub main
|
||||
print "WARNING: my_print_defaults command not found.\n";
|
||||
print "Please make sure you have this command available and\n";
|
||||
print "in your path. The command is available from the latest\n";
|
||||
print "MySQL distribution.\n";
|
||||
print "MariaDB distribution.\n";
|
||||
$my_print_defaults_exists= 0;
|
||||
}
|
||||
|
||||
@ -153,7 +153,7 @@ sub main
|
||||
if (!defined(my_which(my_print_defaults)))
|
||||
{
|
||||
print "ABORT: Can't find command 'my_print_defaults'.\n";
|
||||
print "This command is available from the latest MySQL\n";
|
||||
print "This command is available from the latest MariaDB\n";
|
||||
print "distribution. Please make sure you have the command\n";
|
||||
print "in your PATH.\n";
|
||||
exit(1);
|
||||
@ -265,17 +265,17 @@ sub init_log
|
||||
}
|
||||
|
||||
####
|
||||
#### Report living and not running MySQL servers
|
||||
#### Report living and not running MariaDB servers
|
||||
####
|
||||
|
||||
sub report_mysqlds
|
||||
{
|
||||
my (@groups, $com, $i, @options, $pec);
|
||||
|
||||
print "Reporting MySQL servers\n";
|
||||
print "Reporting MariaDB servers\n";
|
||||
if (!$opt_no_log)
|
||||
{
|
||||
w2log("\nReporting MySQL servers","$opt_log",0,0);
|
||||
w2log("\nReporting MariaDB servers","$opt_log",0,0);
|
||||
}
|
||||
@groups = &find_groups($groupids);
|
||||
for ($i = 0; defined($groups[$i]); $i++)
|
||||
@ -286,19 +286,19 @@ sub report_mysqlds
|
||||
$pec = $? >> 8;
|
||||
if ($pec)
|
||||
{
|
||||
print "MySQL server from group: $groups[$i] is not running\n";
|
||||
print "MariaDB server from group: $groups[$i] is not running\n";
|
||||
if (!$opt_no_log)
|
||||
{
|
||||
w2log("MySQL server from group: $groups[$i] is not running",
|
||||
w2log("MariaDB server from group: $groups[$i] is not running",
|
||||
"$opt_log", 0, 0);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
print "MySQL server from group: $groups[$i] is running\n";
|
||||
print "MariaDB server from group: $groups[$i] is running\n";
|
||||
if (!$opt_no_log)
|
||||
{
|
||||
w2log("MySQL server from group: $groups[$i] is running",
|
||||
w2log("MariaDB server from group: $groups[$i] is running",
|
||||
"$opt_log", 0, 0);
|
||||
}
|
||||
}
|
||||
@ -323,11 +323,11 @@ sub start_mysqlds()
|
||||
|
||||
if (!$opt_no_log)
|
||||
{
|
||||
w2log("\nStarting MySQL servers\n","$opt_log",0,0);
|
||||
w2log("\nStarting MariaDB servers\n","$opt_log",0,0);
|
||||
}
|
||||
else
|
||||
{
|
||||
print "\nStarting MySQL servers\n";
|
||||
print "\nStarting MariaDB servers\n";
|
||||
}
|
||||
@groups = &find_groups($groupids);
|
||||
for ($i = 0; defined($groups[$i]); $i++)
|
||||
@ -398,7 +398,7 @@ sub start_mysqlds()
|
||||
}
|
||||
if (!$i && !$opt_no_log)
|
||||
{
|
||||
w2log("No MySQL servers to be started (check your GNRs)",
|
||||
w2log("No MariaDB servers to be started (check your GNRs)",
|
||||
"$opt_log", 0, 0);
|
||||
}
|
||||
}
|
||||
@ -413,11 +413,11 @@ sub stop_mysqlds()
|
||||
|
||||
if (!$opt_no_log)
|
||||
{
|
||||
w2log("\nStopping MySQL servers\n","$opt_log",0,0);
|
||||
w2log("\nStopping MariaDB servers\n","$opt_log",0,0);
|
||||
}
|
||||
else
|
||||
{
|
||||
print "\nStopping MySQL servers\n";
|
||||
print "\nStopping MariaDB servers\n";
|
||||
}
|
||||
@groups = &find_groups($groupids);
|
||||
for ($i = 0; defined($groups[$i]); $i++)
|
||||
@ -430,7 +430,7 @@ sub stop_mysqlds()
|
||||
}
|
||||
if (!$i && !$opt_no_log)
|
||||
{
|
||||
w2log("No MySQL servers to be stopped (check your GNRs)",
|
||||
w2log("No MariaDB servers to be stopped (check your GNRs)",
|
||||
"$opt_log", 0, 0);
|
||||
}
|
||||
}
|
||||
@ -638,23 +638,23 @@ sub example
|
||||
#
|
||||
# 1.COMMON USER
|
||||
#
|
||||
# Make sure that the MySQL user, who is stopping the mysqld services, has
|
||||
# the same password to all MySQL servers being accessed by $my_progname.
|
||||
# Make sure that the MariaDB user, who is stopping the mysqld services, has
|
||||
# the same password to all MariaDB servers being accessed by $my_progname.
|
||||
# This user needs to have the 'Shutdown_priv' -privilege, but for security
|
||||
# reasons should have no other privileges. It is advised that you create a
|
||||
# common 'multi_admin' user for all MySQL servers being controlled by
|
||||
# common 'multi_admin' user for all MariaDB servers being controlled by
|
||||
# $my_progname. Here is an example how to do it:
|
||||
#
|
||||
# GRANT SHUTDOWN ON *.* TO multi_admin\@localhost IDENTIFIED BY 'password'
|
||||
#
|
||||
# You will need to apply the above to all MySQL servers that are being
|
||||
# You will need to apply the above to all MariaDB servers that are being
|
||||
# controlled by $my_progname. 'multi_admin' will shutdown the servers
|
||||
# using 'mysqladmin' -binary, when '$my_progname stop' is being called.
|
||||
#
|
||||
# 2.PID-FILE
|
||||
#
|
||||
# If you are using mysqld_safe to start mysqld, make sure that every
|
||||
# MySQL server has a separate pid-file. In order to use mysqld_safe
|
||||
# MariaDB server has a separate pid-file. In order to use mysqld_safe
|
||||
# via $my_progname, you need to use two options:
|
||||
#
|
||||
# mysqld=/path/to/mysqld_safe
|
||||
@ -667,7 +667,7 @@ sub example
|
||||
#
|
||||
# 3.DATA DIRECTORY
|
||||
#
|
||||
# It is NOT advised to run many MySQL servers within the same data directory.
|
||||
# It is NOT advised to run many MariaDB servers within the same data directory.
|
||||
# You can do so, but please make sure to understand and deal with the
|
||||
# underlying caveats. In short they are:
|
||||
# - Speed penalty
|
||||
@ -688,7 +688,7 @@ sub example
|
||||
# intentionally left out. You may have 'gaps' in the config file. This
|
||||
# gives you more flexibility.
|
||||
#
|
||||
# 6.MySQL Server User
|
||||
# 6.MariaDB Server User
|
||||
#
|
||||
# You can pass the user=... option inside [mysqld#] groups. This
|
||||
# can be very handy in some cases, but then you need to run $my_progname
|
||||
@ -696,7 +696,7 @@ sub example
|
||||
#
|
||||
# 7.A Start-up Manage Script for $my_progname
|
||||
#
|
||||
# In the recent MySQL distributions you can find a file called
|
||||
# In the recent MariaDB distributions you can find a file called
|
||||
# mysqld_multi.server.sh. It is a wrapper for $my_progname. This can
|
||||
# be used to start and stop multiple servers during boot and shutdown.
|
||||
#
|
||||
@ -709,7 +709,7 @@ sub example
|
||||
# or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.
|
||||
#
|
||||
# The script can be found from support-files/mysqld_multi.server.sh
|
||||
# in MySQL distribution. (Verify the script before using)
|
||||
# in MariaDB distribution. (Verify the script before using)
|
||||
#
|
||||
|
||||
[mysqld_multi]
|
||||
@ -828,7 +828,7 @@ Using: @{[join ' ', @defaults_options]}
|
||||
file is turned on.
|
||||
--password=... Password for mysqladmin user.
|
||||
--silent Disable warnings.
|
||||
--tcp-ip Connect to the MySQL server(s) via the TCP/IP port instead
|
||||
--tcp-ip Connect to the MariaDB server(s) via the TCP/IP port instead
|
||||
of the UNIX socket. This affects stopping and reporting.
|
||||
If a socket file is missing, the server may still be
|
||||
running, but can be accessed only via the TCP/IP port.
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
=head1 NAME
|
||||
|
||||
mytop - display MySQL server performance info like `top'
|
||||
mytop - display MariaDB server performance info like `top'
|
||||
|
||||
=cut
|
||||
|
||||
@ -257,7 +257,7 @@ my $dbh = DBI->connect($dsn, $config{user}, $config{pass},
|
||||
if (not ref $dbh)
|
||||
{
|
||||
my $Error = <<EODIE
|
||||
Cannot connect to MySQL server. Please check the:
|
||||
Cannot connect to MariaDB server. Please check the:
|
||||
|
||||
* database you specified "$config{db}" (default is "test")
|
||||
* username you specified "$config{user}" (default is "root")
|
||||
@ -1905,12 +1905,11 @@ pick up Term::ReadKey here:
|
||||
|
||||
http://search.cpan.org/search?dist=TermReadKey
|
||||
|
||||
And you obviously need access to a MySQL server (version 3.22.x or
|
||||
3.23.x) with the necessary security to run the I<SHOW PROCESSLIST> and
|
||||
I<SHOW STATUS> commands.
|
||||
And you obviously need access to a MariaDB server with the necessary
|
||||
security to run the I<SHOW PROCESSLIST> and I<SHOW STATUS> commands.
|
||||
|
||||
If you are a Windows user, using ActiveState's Perl, you can use PPM
|
||||
(the Perl Package Manager) to install the MySQL and Term::ReadKey
|
||||
(the Perl Package Manager) to install the MariaDB/MySQL and Term::ReadKey
|
||||
modules.
|
||||
|
||||
=head2 Optional Color Support
|
||||
@ -1962,24 +1961,24 @@ B<mytop> was inspired by the system monitoring tool B<top>. I
|
||||
routinely use B<top> on Linux, FreeBSD, and Solaris. You are likely to
|
||||
notice features from each of them here.
|
||||
|
||||
B<mytop> will connect to a MySQL server and periodically run the
|
||||
B<mytop> will connect to a MariaDB server and periodically run the
|
||||
I<SHOW PROCESSLIST> and I<SHOW STATUS> commands and attempt to
|
||||
summarize the information from them in a useful format.
|
||||
|
||||
=head2 The Display
|
||||
|
||||
The B<mytop> display screen is really broken into two parts. The top 4
|
||||
lines (header) contain summary information about your MySQL
|
||||
lines (header) contain summary information about your MariaDB
|
||||
server. For example, you might see something like:
|
||||
|
||||
MySQL on localhost (4.0.13-log) up 1+11:13:00 [23:29:11]
|
||||
MariaDB on localhost (10.0.13-log) up 1+11:13:00 [23:29:11]
|
||||
Queries: 19.3M qps: 160 Slow: 1.0 Se/In/Up/De(%): 00/80/03/17
|
||||
qps now: 219 Slow qps: 0.0 Threads: 1 ( 1/ 16) 00/74/00/25
|
||||
Key Efficiency: 99.3% Bps in/out: 30.5k/162.8 Now in/out: 32.7k/ 3.3k
|
||||
|
||||
The first line identifies the hostname of the server (localhost) and
|
||||
the version of MySQL it is running. The right had side shows the
|
||||
uptime of the MySQL server process in days+hours:minutes:seconds
|
||||
the version of MariaDB it is running. The right had side shows the
|
||||
uptime of the MariaDB server process in days+hours:minutes:seconds
|
||||
format (much like FreeBSD's top) as well as the current time.
|
||||
|
||||
The second line displays the total number of queries the server has
|
||||
@ -1993,7 +1992,7 @@ on the previous line).
|
||||
|
||||
And the fourth line displays key buffer efficiency (how often keys are
|
||||
read from the buffer rather than disk) and the number of bytes that
|
||||
MySQL has sent and received, both over all and in the last cycle.
|
||||
MariaDB has sent and received, both over all and in the last cycle.
|
||||
|
||||
You can toggle the header by hitting B<h> when running B<mytop>.
|
||||
|
||||
@ -2039,21 +2038,21 @@ have two dashes `--'. Short arguments only have one '-'.
|
||||
|
||||
=item B<-u> or B<-user> username
|
||||
|
||||
Username to use when logging in to the MySQL server. Default: ``root''.
|
||||
Username to use when logging in to the MariaDB server. Default: ``root''.
|
||||
|
||||
=item B<-p> or B<-pass> or B<-password> password
|
||||
|
||||
Password to use when logging in to the MySQL server. Default: none.
|
||||
Password to use when logging in to the MariaDB server. Default: none.
|
||||
|
||||
=item B<-h> or B<--host> hostname[:port]
|
||||
|
||||
Hostname of the MySQL server. The hostname may be followed by an
|
||||
Hostname of the MariaDB server. The hostname may be followed by an
|
||||
option port number. Note that the port is specified separate from the
|
||||
host when using a config file. Default: ``localhost''.
|
||||
|
||||
=item B<--port> or B<-P> port
|
||||
|
||||
If you're running MySQL on a non-standard port, use this to specify
|
||||
If you're running MariaDB on a non-standard port, use this to specify
|
||||
the port number. Default: 3306.
|
||||
|
||||
=item B<-s> or B<--delay> seconds
|
||||
@ -2071,15 +2070,15 @@ In batch mode, mytop runs only once, does not clear the screen, and
|
||||
places no limit on the number of lines it will print. This is suitable
|
||||
for running periodically (perhaps from cron) to capture the
|
||||
information into a file for later viewing. You might use batch mode in
|
||||
a CGI script to occasionally display your MySQL server status on the
|
||||
a CGI script to occasionally display your MariaDB server status on the
|
||||
web.
|
||||
|
||||
Default: unset.
|
||||
|
||||
=item B<-S> or B<--socket> /path/to/socket
|
||||
|
||||
If you're running B<mytop> on the same host as MySQL, you may wish to
|
||||
have it use the MySQL socket directly rather than a standard TCP/IP
|
||||
If you're running B<mytop> on the same host as MariaDB, you may wish to
|
||||
have it use the MariaDB socket directly rather than a standard TCP/IP
|
||||
connection. If you do,just specify one.
|
||||
|
||||
Note that specifying a socket will make B<mytop> ignore any host
|
||||
@ -2125,7 +2124,7 @@ Default: noprompt.
|
||||
|
||||
=item B<--resolve>
|
||||
|
||||
If you have skip-resolve set on MySQL (to keep it from doing a reverse
|
||||
If you have skip-resolve set on MariaDB (to keep it from doing a reverse
|
||||
DNS lookup on each inbound connection), mytop can replace IP addresses
|
||||
with hostnames but toggling this option.
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user