Changed safe_mysqld -> mysqld_safe

Added some alias to SHOW commands
Prepare for dynamic changing of MySQL variables


man/Makefile.am:
  Changed safe_mysqld -> mysqld_safe
man/isamchk.1:
  Changed safe_mysqld -> mysqld_safe
man/isamlog.1:
  Changed safe_mysqld -> mysqld_safe
man/mysql.1:
  Changed safe_mysqld -> mysqld_safe
man/mysql_zap.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqlaccess.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqladmin.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld_multi.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld_safe.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqldump.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqlshow.1:
  Changed safe_mysqld -> mysqld_safe
man/perror.1:
  Changed safe_mysqld -> mysqld_safe
man/replace.1:
  Changed safe_mysqld -> mysqld_safe
man/which.2:
  Changed safe_mysqld -> mysqld_safe
myisam/mi_search.c:
  Fixed bug when using packed keys.
scripts/Makefile.am:
  Changed safe_mysqld -> mysqld_safe
scripts/make_binary_distribution.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysql_install_db.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_multi.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe-watch.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe.sh:
  Changed safe_mysqld -> mysqld_safe
sql/lex.h:
  Addex SHOW INDEXES as an alias for SHOW INDEX
sql/sql_class.cc:
  Prepare for dynamic changing of MySQL variables
sql/sql_lex.h:
  Prepare for dynamic changing of MySQL variables
sql/sql_yacc.yy:
  Some changes to SHOW commands.
support-files/binary-configure.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql-max.spec.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql-multi.server.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql.server.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql.spec.sh:
  Changed safe_mysqld -> mysqld_safe

6 files changed, 19 insertions, 19 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 45fbe275476..d2cca98ce63 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -44,7 +44,7 @@ EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			mysqlhotcopy.sh \
 		        mysqldumpslow.sh \
 			mysqld_multi.sh \
-			safe_mysqld.sh
+			mysqld_safe.sh
 
 EXTRA_DIST =		$(EXTRA_SCRIPTS) \
 			mysqlaccess.conf \
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 40c48188346..1848123fd8e 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -117,7 +117,7 @@ rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_
 
 $BASE/bin/replace \@localstatedir\@ ./data \@bindir\@ ./bin \@scriptdir\@ ./bin \@libexecdir\@ ./bin \@sbindir\@ ./bin \@prefix\@ . \@HOSTNAME\@ @HOSTNAME@ < $SOURCE/scripts/mysql_install_db.sh > $BASE/scripts/mysql_install_db
 $BASE/bin/replace \@prefix\@ /usr/local/mysql \@bindir\@ ./bin \@MYSQLD_USER\@ root \@localstatedir\@ /usr/local/mysql/data < $SOURCE/support-files/mysql.server.sh > $BASE/support-files/mysql.server
-$BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/safe_mysqld
+$BASE/bin/replace /my/gnu/bin/hostname /bin/hostname -- $BASE/bin/mysqld_safe
 
 mv $BASE/support-files/binary-configure $BASE/configure
 chmod a+x $BASE/bin/* $BASE/scripts/* $BASE/support-files/mysql-* $BASE/configure
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index f7324668bd2..7e232692ba1 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -333,7 +333,7 @@ then
   if test "$IN_RPM" -eq 0
   then
     echo "You can start the MySQL daemon with:"
-    echo "cd @prefix@ ; $bindir/safe_mysqld &"
+    echo "cd @prefix@ ; $bindir/mysqld_safe &"
     echo
     echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
     echo "cd sql-bench ; run-all-tests"
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 1adaa458271..656894f0e37 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -457,12 +457,12 @@ sub example
 #   directory, that you have (just change the socket, -S=...)
 #   See more detailed information from chapter:
 #   '6 The MySQL Access Privilege System' from the MySQL manual.
-# 2.pid-file is very important, if you are using safe_mysqld to start mysqld
-#   (e.g. --mysqld=safe_mysqld) Every mysqld should have it's own pid-file.
-#   The advantage using safe_mysqld instead of mysqld directly here is, that
-#   safe_mysqld 'guards' every mysqld process and will restart it, if mysqld
+# 2.pid-file is very important, if you are using mysqld_safe to start mysqld
+#   (e.g. --mysqld=mysqld_safe) Every mysqld should have it's own pid-file.
+#   The advantage using mysqld_safe instead of mysqld directly here is, that
+#   mysqld_safe 'guards' every mysqld process and will restart it, if mysqld
 #   process fails due to signal kill -9, or similar. (Like segmentation fault,
-#   which MySQL should never do, of course ;) Please note that safe_mysqld
+#   which MySQL should never do, of course ;) Please note that mysqld_safe
 #   script may require that you start it from a certain place. This means that
 #   you may have to CD to a certain directory, before you start the
 #   mysqld_multi. If you have problems starting, please see the script.
@@ -497,7 +497,7 @@ sub example
 #   give you extra performance in a threaded system!
 #
 [mysqld_multi]
-mysqld     = @bindir@/safe_mysqld
+mysqld     = @bindir@/mysqld_safe
 mysqladmin = @bindir@/mysqladmin
 user       = multi_admin
 password   = multipass
@@ -591,9 +591,9 @@ Options:
                    Using: $opt_log
 --mysqladmin=...   mysqladmin binary to be used for a server shutdown.
                    Using: $mysqladmin
---mysqld=...       mysqld binary to be used. Note that you can give safe_mysqld
+--mysqld=...       mysqld binary to be used. Note that you can give mysqld_safe
                    to this option also. The options are passed to mysqld. Just
-                   make sure you have mysqld in your PATH or fix safe_mysqld.
+                   make sure you have mysqld in your PATH or fix mysqld_safe.
                    Using: $mysqld
 --no-log           Print to stdout instead of the log file. By default the log
                    file is turned on.
diff --git a/scripts/safe_mysqld-watch.sh b/scripts/mysqld_safe-watch.sh
index 30f95fd7a86..c59b3b2614d 100644
--- a/scripts/safe_mysqld-watch.sh
+++ b/scripts/mysqld_safe-watch.sh
@@ -8,7 +8,7 @@
 # binary installation that has other paths than you are using.
 #
 # mysql.server works by first doing a cd to the base directory and from there
-# executing safe_mysqld
+# executing mysqld_safe
 
 # Check if we are starting this relative (for the binary release)
 if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
diff --git a/scripts/safe_mysqld.sh b/scripts/mysqld_safe.sh
index 6eda1740ad6..ac33c9ad1f2 100644
--- a/scripts/safe_mysqld.sh
+++ b/scripts/mysqld_safe.sh
@@ -8,7 +8,7 @@
 # binary installation that has other paths than you are using.
 #
 # mysql.server works by first doing a cd to the base directory and from there
-# executing safe_mysqld
+# executing mysqld_safe
 
 trap '' 1 2 3 15			# we shouldn't let anyone kill us
 
@@ -38,12 +38,12 @@ parse_arguments() {
       --pid-file=*) pid_file=`echo "$arg" | sed -e "s;--pid-file=;;"` ;;
       --user=*)    user=`echo "$arg" | sed -e "s;--user=;;"` ;;
 
-      # these two might have been set in a [safe_mysqld] section of my.cnf
-      # they get passed via environment variables to safe_mysqld
+      # these two might have been set in a [mysqld_safe] section of my.cnf
+      # they get passed via environment variables to mysqld_safe
       --socket=*)  MYSQL_UNIX_PORT=`echo "$arg" | sed -e "s;--socket=;;"` ;;
       --port=*)    MYSQL_TCP_PORT=`echo "$arg" | sed -e "s;--port=;;"` ;;
 
-      # safe_mysqld-specific options - must be set in my.cnf ([safe_mysqld])!
+      # mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])!
       --ledir=*)   ledir=`echo "$arg" | sed -e "s;--ledir=;;"` ;;
       --err-log=*) err_log=`echo "$arg" | sed -e "s;--err-log=;;"` ;;
       # QQ The --open-files should be removed
@@ -114,7 +114,7 @@ fi
 pid_file=
 err_log=
 
-# Get first arguments from the my.cnf file, groups [mysqld] and [safe_mysqld]
+# Get first arguments from the my.cnf file, groups [mysqld] and [mysqld_safe]
 # and then merge with the command line arguments
 if test -x ./bin/my_print_defaults
 then
@@ -130,7 +130,7 @@ else
 fi
 
 args=
-parse_arguments `$print_defaults $defaults mysqld server safe_mysqld`
+parse_arguments `$print_defaults $defaults mysqld server mysqld_safe safe_mysqld`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
 if test ! -x $ledir/$MYSQLD
@@ -138,7 +138,7 @@ then
   echo "The file $ledir/$MYSQLD doesn't exist or is not executable"
   echo "Please do a cd to the mysql installation directory and restart"
   echo "this script from there as follows:"
-  echo "./bin/safe_mysqld".
+  echo "./bin/mysqld_safe".
   exit 1
 fi