diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mysql_convert_table_format.sh | 3 | ||||
-rw-r--r-- | scripts/mysql_find_rows.sh | 3 | ||||
-rw-r--r-- | scripts/mysql_install_db.sh | 4 | ||||
-rw-r--r-- | scripts/mysql_secure_installation.sh | 4 | ||||
-rw-r--r-- | scripts/mysql_setpermission.sh | 3 | ||||
-rw-r--r-- | scripts/mysqlaccess.sh | 2 | ||||
-rw-r--r-- | scripts/mysqld_multi.sh | 2 | ||||
-rw-r--r-- | scripts/mysqld_safe.sh | 6 | ||||
-rw-r--r-- | scripts/mysqldumpslow.sh | 3 | ||||
-rw-r--r-- | scripts/mysqlhotcopy.sh | 3 |
10 files changed, 29 insertions, 4 deletions
diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh index 6b4d758a513..c3a719e4543 100644 --- a/scripts/mysql_convert_table_format.sh +++ b/scripts/mysql_convert_table_format.sh @@ -19,6 +19,9 @@ use DBI; use Getopt::Long; +warn "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-convert-table-format' instead\n" + if $0 =~ m/mysql_convert_table_format$/; + $opt_help=$opt_version=$opt_verbose=$opt_force=0; $opt_user=$opt_database=$opt_password=undef; $opt_host="localhost"; diff --git a/scripts/mysql_find_rows.sh b/scripts/mysql_find_rows.sh index 09bcc22790a..a54ceee4071 100644 --- a/scripts/mysql_find_rows.sh +++ b/scripts/mysql_find_rows.sh @@ -18,6 +18,9 @@ $version="1.02"; use Getopt::Long; +warn "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-find-rows' instead\n" + if $0 =~ m/mysql_find_rows$/; + $opt_help=$opt_Information=$opt_skip_use_db=0; $opt_regexp=$opt_dbregexp=".*"; $opt_start_row=1; $opt_rows=9999999999; diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index aeda217b39a..11e2f482273 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -47,8 +47,8 @@ dirname0=`dirname $0 2>/dev/null` dirname0=`dirname $dirname0 2>/dev/null` case "$0" in - *mysql*) - echo "Notice: $0 is deprecated and will be removed in a future release, use command mariadb-install-db" 1>&2 + *mysqld_install_db) + echo "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-install-db' instead" 1>&2 ;; esac diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh index 8dee27c2f7c..06229cf3d25 100644 --- a/scripts/mysql_secure_installation.sh +++ b/scripts/mysql_secure_installation.sh @@ -30,8 +30,8 @@ defaults_extra_file= no_defaults= case "$0" in - *mysql*) - echo "Notice: $0 is deprecated and will be removed in a future release, use command mariadb-secure-installation" 1>&2 + *mysql_secure_installation) + echo "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-secure-installation' instead" 1>&2 ;; esac diff --git a/scripts/mysql_setpermission.sh b/scripts/mysql_setpermission.sh index b3c9c27ca88..76c07b6816b 100644 --- a/scripts/mysql_setpermission.sh +++ b/scripts/mysql_setpermission.sh @@ -55,6 +55,9 @@ use vars qw($dbh $sth $hostname $opt_user $opt_password $opt_help $opt_host my $sqlhost = ""; my $user = ""; +warn "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-setpermission' instead\n" + if $0 =~ m/mysql_setpermission$/; + $dbh=$host=$opt_user= $opt_password= $opt_help= $opt_host= $opt_socket= ""; $opt_port=3306; diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh index c9b1b72dc21..71f77cf8a11 100644 --- a/scripts/mysqlaccess.sh +++ b/scripts/mysqlaccess.sh @@ -32,6 +32,8 @@ BEGIN { $script = 'MySQLAccess' unless $script; $script_conf = "$script.conf"; $script_log = $ENV{'HOME'}."/$script.log"; + warn "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-access' instead\n" + if $0 =~ m/mysqlaccess$/; # **************************** # information on MariaDB diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 9a1f3920f67..4e774e3c5ee 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -50,6 +50,8 @@ $homedir = $ENV{HOME}; $my_progname = $0; $my_progname =~ s/.*[\/]//; +warn "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-multi' instead\n" + if $0 =~ m/mysqld_multi$/; if (defined($ENV{UMASK})) { my $UMASK = $ENV{UMASK}; diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 34a2de1c119..0802cf0614a 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -40,6 +40,12 @@ syslog_tag_mysqld_safe=mysqld_safe trap '' 1 2 3 15 # we shouldn't let anyone kill us +case "$0" in + *mysqld_safe) + echo "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-safe' instead" 1>&2 + ;; +esac + # MySQL-specific environment variable. First off, it's not really a umask, # it's the desired mode. Second, it follows umask(2), not umask(3) in that # octal needs to be explicit. Our shell might be a proper sh without printf, diff --git a/scripts/mysqldumpslow.sh b/scripts/mysqldumpslow.sh index 5c46587e9e4..582f5c404fb 100644 --- a/scripts/mysqldumpslow.sh +++ b/scripts/mysqldumpslow.sh @@ -26,6 +26,9 @@ use strict; use Getopt::Long; +warn "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-dumpslow' instead\n" + if $0 =~ m/mysqldumpslow$/; + # t=time, l=lock time, r=rows, a=rows affected # at, al, ar and aa are the corresponding averages diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index 44abcfec055..a4445612beb 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -27,6 +27,9 @@ use Sys::Hostname; use File::Copy; use File::Temp qw(tempfile); +warn "$0: Deprecated program name. It will be removed in a future release, use 'mariadb-hotcopy' instead\n" + if $0 =~ m/mysqlhotcopy$/; + =head1 NAME mysqlhotcopy - fast on-line hot-backup utility for local MySQL databases and tables |