update mysql install document

Author: yukio-goto

mysql/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-MYSQL_VER=5.0.33
+MYSQL_VER=5.1.59
 
 cd /usr/local/src
 
@@ -12,7 +12,7 @@ fi
 
 if [ ! -f mysql-${MYSQL_VER}.tar.gz ];
 then
-  wget http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.33.tar.gz
+  wget http://downloads.mysql.com/archives/mysql-5.1/mysql-${MYSQL_VER}.tar.gz
 fi
 
 
@@ -23,7 +23,6 @@ cd mysql-${MYSQL_VER}
 INSTALL_DIR=/usr/local/mysql-${MYSQL_VER}
 
 ./configure --prefix=${INSTALL_DIR} \
-  --datadir=/usr/local/var/data/mysql \
   --with-charset=utf8 \
   --with-extra-charsets=ujis,sjis,cp932 \
   --enable-thread-safe-client

mysql/install.txt

@@ -20,12 +20,9 @@ chown mysql:mysql -R /usr/local/var/mysql
 chmod go-rwx /usr/local/var/mysql
 
 su mysql
-/usr/local/mysql/bin/mysql_install_db --user=mysql --datadir=/usr/local/var/mysql
+/usr/local/mysql/bin/mysql_install_db --user=mysql --datadir=/usr/local/var/mysql --basedir=/usr/local/mysql
 
-mkdir /usr/local/mysql/conf
-
-
-cp ./my.cf /usr/local/mysql/conf/my.cf
+cp ./my.cnf /usr/local/var/mysql/
 
 # copy mysql.server from this directory
 cp ./mysql.server /etc/init.d/

mysql/my.cf mysql/my.cnf

@@ -4,11 +4,11 @@
 # an important part, or systems up to 128M where MySQL is used together with
 # other programs (such as a web server)
 #
-# You can copy this file to
-# /etc/my.cnf to set global options,
-# mysql-data-dir/my.cnf to set server-specific options (in this
-# installation this directory is /usr/local/mysql-5.0.33/var) or
-# ~/.my.cnf to set user-specific options.
+# MySQL programs look for option files in a set of
+# locations which depend on the deployment platform.
+# You can copy this option file to one of those
+# locations. For information about these locations, see:
+# http://dev.mysql.com/doc/mysql/en/option-files.html
 #
 # In this file, you can use all long options that a program supports.
 # If you want to know which options a program supports, run the program
@@ -27,15 +27,18 @@ socket		= /tmp/mysql.sock
 port		= 3306
 socket		= /tmp/mysql.sock
 skip-locking
-key_buffer = 16M
+key_buffer_size = 16M
 max_allowed_packet = 1M
-table_cache = 64
+table_open_cache = 64
 sort_buffer_size = 512K
 net_buffer_length = 8K
 read_buffer_size = 256K
 read_rnd_buffer_size = 512K
 myisam_sort_buffer_size = 8M
 
+datadir=/usr/local/var/mysql
+basedir=/usr/local/mysql
+
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
 # All interaction with mysqld must be made via Unix sockets or named pipes.
@@ -48,6 +51,9 @@ myisam_sort_buffer_size = 8M
 # binary logging is required for replication
 log-bin=mysql-bin
 
+# binary logging format - mixed recommended
+binlog_format=mixed
+
 # required unique id between 1 and 2^32 - 1
 # defaults to 1 if master-host is not set
 # but will not function as a master if omitted
@@ -108,19 +114,10 @@ server-id	= 1
 # binary logging - not required for slaves, but recommended
 #log-bin=mysql-bin
 
-# Point the following paths to different dedicated disks
-#tmpdir		= /tmp/		
-#log-update 	= /path-to-dedicated-directory/hostname
-
-# Uncomment the following if you are using BDB tables
-#bdb_cache_size = 4M
-#bdb_max_lock = 10000
-
 # Uncomment the following if you are using InnoDB tables
-innodb_data_home_dir = /usr/local/var/mysql/
+innodb_data_home_dir = /usr/local/var/mysql
 innodb_data_file_path = ibdata1:10M:autoextend
 innodb_log_group_home_dir = /usr/local/var/mysql/
-innodb_log_arch_dir = /usr/local/var/mysql
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 innodb_buffer_pool_size = 16M
@@ -140,20 +137,11 @@ no-auto-rehash
 # Remove the next comment character if you are not familiar with SQL
 #safe-updates
 
-[isamchk]
-key_buffer = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
 [myisamchk]
-key_buffer = 20M
+key_buffer_size = 20M
 sort_buffer_size = 20M
 read_buffer = 2M
 write_buffer = 2M
 
 [mysqlhotcopy]
 interactive-timeout
-
-[safe_mysqld]
-errlog=/usr/local/var/mysql/mysqld.log

mysql/mysql.server

@@ -24,8 +24,8 @@
 # Short-Description: start and stop MySQL
 # Description: MySQL is a very fast and reliable SQL database engine.
 ### END INIT INFO
-
-# If you install MySQL on some other places than /usr/local/mysql-5.0.33, then you
+ 
+# If you install MySQL on some other places than /usr/local/mysql-5.1.59, then you
 # have to do one of the following things for this script to work:
 #
 # - Run this script from within the MySQL installation directory
@@ -43,8 +43,15 @@
 # If you change base dir, you must also change datadir. These may get
 # overwritten by settings in the MySQL configuration files.
 
-basedir=
-datadir=
+basedir=/usr/local/mysql
+datadir=/usr/local/var/mysql
+
+# Default value, in seconds, afterwhich the script should timeout waiting
+# for server start. 
+# Value here is overriden by value in my.cnf. 
+# 0 means don't wait at all
+# Negative numbers mean to wait indefinitely
+service_startup_timeout=900
 
 # The following variables are only set for letting mysql.server find things.
 
@@ -55,14 +62,14 @@ use_mysqld_safe=1
 user=mysql
 if test -z "$basedir"
 then
-  basedir=/usr/local/mysql
-  bindir=/usr/local/mysql/bin
+  basedir=/usr/local/mysql-5.1.59
+  bindir=/usr/local/mysql-5.1.59/bin
   if test -z "$datadir"
   then
-    datadir=/usr/local/var/mysql
+    datadir=/usr/local/mysql-5.1.59/var
   fi
-  sbindir=/usr/local/mysql/sbin
-  libexecdir=/usr/local/mysql/libexec
+  sbindir=/usr/local/mysql-5.1.59/sbin
+  libexecdir=/usr/local/mysql-5.1.59/libexec
 else
   bindir="$basedir/bin"
   if test -z "$datadir"
@@ -115,17 +122,18 @@ parse_server_arguments() {
     case "$arg" in
       --basedir=*)  basedir=`echo "$arg" | sed -e 's/^[^=]*=//'`
                     bindir="$basedir/bin"
-        if test -z "$datadir_set"; then
-          datadir="$basedir/data"
-        fi
-        sbindir="$basedir/sbin"
-        libexecdir="$basedir/libexec"
+		    if test -z "$datadir_set"; then
+		      datadir="$basedir/data"
+		    fi
+		    sbindir="$basedir/sbin"
+		    libexecdir="$basedir/libexec"
         ;;
       --datadir=*)  datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
-        datadir_set=1
-  ;;
+		    datadir_set=1
+	;;
       --user=*)  user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
       --pid-file=*) server_pid_file=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+      --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
       --use-mysqld_safe) use_mysqld_safe=1;;
       --use-manager)     use_mysqld_safe=0;;
     esac
@@ -142,29 +150,55 @@ parse_manager_arguments() {
 }
 
 wait_for_pid () {
+  verb="$1"
+  manager_pid="$2"  # process ID of the program operating on the pid-file
   i=0
-  while test $i -lt 35 ; do
-    sleep 1
-    case "$1" in
+  avoid_race_condition="by checking again"
+  while test $i -ne $service_startup_timeout ; do
+
+    case "$verb" in
       'created')
+        # wait for a PID-file to pop into existence.
         test -s $pid_file && i='' && break
         ;;
       'removed')
+        # wait for this PID-file to disappear
         test ! -s $pid_file && i='' && break
         ;;
       *)
-        echo "wait_for_pid () usage: wait_for_pid created|removed"
+        echo "wait_for_pid () usage: wait_for_pid created|removed manager_pid"
         exit 1
         ;;
     esac
+
+    # if manager isn't running, then pid-file will never be updated
+    if test -n "$manager_pid"; then
+      if kill -0 "$manager_pid" 2>/dev/null; then
+        :  # the manager still runs
+      else
+        # The manager may have exited between the last pid-file check and now.  
+        if test -n "$avoid_race_condition"; then
+          avoid_race_condition=""
+          continue  # Check again.
+        fi
+
+        # there's nothing that will affect the file.
+        log_failure_msg "Manager of pid-file quit without updating file."
+        return 1  # not waiting any more.
+      fi
+    fi
+
     echo $echo_n ".$echo_c"
     i=`expr $i + 1`
+    sleep 1
   done
 
   if test -z "$i" ; then
     log_success_msg
+    return 0
   else
     log_failure_msg
+    return 1
   fi
 }
 
@@ -189,7 +223,7 @@ else
     dirs=`sed -e "/$subpat/!d" -e 's//\1/' $conf`
     for d in $dirs
     do
-      d=`echo $d | sed -e 's/[  ]//g'`
+      d=`echo $d | sed -e 's/[ 	]//g'`
       if test -x "$d/bin/my_print_defaults"
       then
         print_defaults="$d/bin/my_print_defaults"
@@ -224,8 +258,7 @@ else
 fi
 
 parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server`
-
-# Look for the pidfile
+# Look for the pidfile 
 parse_manager_arguments `$print_defaults $extra_args manager`
 
 #
@@ -250,12 +283,11 @@ else
   esac
 fi
 
-# Safeguard (relative paths, core dumps..)
-cd $basedir
-
 case "$mode" in
   'start')
     # Start daemon
+    # Safeguard (relative paths, core dumps..)
+    cd $basedir
 
     manager=$bindir/mysqlmanager
     if test -x $libexecdir/mysqlmanager
@@ -276,29 +308,35 @@ case "$mode" in
       fi
       # Give extra arguments to mysqld with the my.cnf file. This script may
       # be overwritten at next upgrade.
-      $manager --user=$user --pid-file=$pid_file >/dev/null 2>&1 &
-      wait_for_pid created
+      "$manager" \
+        --mysqld-safe-compatible \
+        --user="$user" \
+        --pid-file="$pid_file" >/dev/null 2>&1 &
+      wait_for_pid created $!; return_value=$?
 
       # Make lock for RedHat / SuSE
       if test -w /var/lock/subsys
       then
         touch /var/lock/subsys/mysqlmanager
       fi
+      exit $return_value
     elif test -x $bindir/mysqld_safe
     then
       # Give extra arguments to mysqld with the my.cnf file. This script
       # may be overwritten at next upgrade.
       pid_file=$server_pid_file
-      $bindir/mysqld_safe --datadir=$datadir --pid-file=$server_pid_file $other_args >/dev/null 2>&1 &
-      wait_for_pid created
+      $bindir/mysqld_safe --datadir=$datadir --pid-file=$server_pid_file \
+          --language=/usr/local/mysql/share/mysql/english $other_args >/dev/null 2>&1 &
+      wait_for_pid created $!; return_value=$?
 
       # Make lock for RedHat / SuSE
       if test -w /var/lock/subsys
       then
         touch /var/lock/subsys/mysql
       fi
+      exit $return_value
     else
-      log_failure_msg "Couldn't find MySQL manager or server"
+      log_failure_msg "Couldn't find MySQL manager ($manager) or server ($bindir/mysqld_safe)"
     fi
     ;;
 
@@ -319,16 +357,24 @@ case "$mode" in
     if test -s "$pid_file"
     then
       mysqlmanager_pid=`cat $pid_file`
-      echo $echo_n "Shutting down MySQL"
-      kill $mysqlmanager_pid
-      # mysqlmanager should remove the pid_file when it exits, so wait for it.
-      wait_for_pid removed
-
+      
+      if (kill -0 $mysqlmanager_pid 2>/dev/null)
+      then
+        echo $echo_n "Shutting down MySQL"
+        kill $mysqlmanager_pid
+        # mysqlmanager should remove the pid_file when it exits, so wait for it.
+        wait_for_pid removed "$mysqlmanager_pid"; return_value=$?
+      else
+        log_failure_msg "MySQL manager or server process #$mysqlmanager_pid is not running!"
+        rm $pid_file
+      fi
+      
       # delete lock for RedHat / SuSE
       if test -f $lock_dir
       then
         rm -f $lock_dir
       fi
+      exit $return_value
     else
       log_failure_msg "MySQL manager or server PID file could not be found!"
     fi
@@ -337,23 +383,61 @@ case "$mode" in
   'restart')
     # Stop the service and regardless of whether it was
     # running or not, start it again.
-    $0 stop  $other_args
-    $0 start $other_args
+    if $0 stop  $other_args; then
+      $0 start $other_args
+    else
+      log_failure_msg "Failed to stop running server, so refusing to try to start."
+      exit 1
+    fi
     ;;
 
-  'reload')
+  'reload'|'force-reload')
     if test -s "$server_pid_file" ; then
-      mysqld_pid=`cat $server_pid_file`
+      read mysqld_pid <  $server_pid_file
       kill -HUP $mysqld_pid && log_success_msg "Reloading service MySQL"
       touch $server_pid_file
     else
       log_failure_msg "MySQL PID file could not be found!"
+      exit 1
     fi
     ;;
-
-  *)
-    # usage
-    echo "Usage: $0  {start|stop|restart|reload}  [ MySQL server options ]"
-    exit 1
+  'status')
+    # First, check to see if pid file exists
+    if test -s "$server_pid_file" ; then 
+      read mysqld_pid < $server_pid_file
+      if kill -0 $mysqld_pid 2>/dev/null ; then 
+        log_success_msg "MySQL running ($mysqld_pid)"
+        exit 0
+      else
+        log_failure_msg "MySQL is not running, but PID file exists"
+        exit 1
+      fi
+    else
+      # Try to find appropriate mysqld process
+      mysqld_pid=`pidof $libexecdir/mysqld`
+      if test -z $mysqld_pid ; then 
+        if test "$use_mysqld_safe" = "0" ; then 
+          lockfile=/var/lock/subsys/mysqlmanager
+        else
+          lockfile=/var/lock/subsys/mysql
+        fi 
+        if test -f $lockfile ; then 
+          log_failure_msg "MySQL is not running, but lock exists"
+          exit 2
+        fi 
+        log_failure_msg "MySQL is not running"
+        exit 3
+      else
+        log_failure_msg "MySQL is running but PID file could not be found"
+        exit 4
+      fi
+    fi
+    ;;
+    *)
+      # usage
+      echo "Usage: $0  {start|stop|restart|reload|force-reload|status}  [ MySQL server options ]"
+      exit 1
     ;;
 esac
+
+exit 0