From df3d259f384183332f932433946947082c9c49eb Mon Sep 17 00:00:00 2001
From: david hill <dhill@mariadb.com>
Date: Thu, 16 Jun 2016 21:51:42 +0000
Subject: [PATCH] MCOL64 more directory name changes

---
 dbcon/mysql/my.cnf            | 10 +++++-----
 dbcon/mysql/mysql-Columnstore | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dbcon/mysql/my.cnf b/dbcon/mysql/my.cnf
index ed9f5fe19..72a442e41 100644
--- a/dbcon/mysql/my.cnf
+++ b/dbcon/mysql/my.cnf
@@ -19,14 +19,14 @@
 # The following options will be passed to all MySQL clients
 [client]
 #password	= your_password
-port		= 3306
+port = 3306
 socket		= /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
-port		= 3306
+port = 3306
 socket		= /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock
 datadir         = /usr/local/mariadb/columnstore/mysql/db
 skip-external-locking
@@ -63,9 +63,9 @@ infinidb_use_import_for_batchinsert=1
 infinidb_import_for_batchinsert_delimiter=7
 
 basedir                         = /usr/local/mariadb/columnstore/mysql/
-character-sets-dir              = /usr/local/mariadb/columnstore/mysql/share/mysql/charsets/
-language                        = /usr/local/mariadb/columnstore/mysql/share/mysql/english/
-plugin_dir                      = /usr/local/mariadb/columnstore/mysql/lib64/mysql/plugin
+character-sets-dir              = /usr/local/mariadb/columnstore/mysql/share/charsets/
+language                        = /usr/local/mariadb/columnstore/mysql/share/english/
+plugin_dir                      = /usr/local/mariadb/columnstore/mysql/lib/plugin
 
 # 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.
diff --git a/dbcon/mysql/mysql-Columnstore b/dbcon/mysql/mysql-Columnstore
index f3fd1de55..378581bb2 100755
--- a/dbcon/mysql/mysql-Columnstore
+++ b/dbcon/mysql/mysql-Columnstore
@@ -80,7 +80,7 @@ then
     datadir=/var/lib/mysql
   fi
   sbindir=/usr/local/sbin
-  libexecdir=/usr/local/sbin
+  bindir=/usr/local/sbin
 else
   bindir="$basedir/bin"
   if test -z "$datadir"
@@ -90,9 +90,9 @@ else
   sbindir="$basedir/sbin"
   if test -f "$basedir/sbin/mysqld"
   then
-    libexecdir="$basedir/sbin"
+    bindir="$basedir/sbin"
   else
-    libexecdir="$basedir/libexec"
+    bindir="$basedir/bin"
   fi
 fi
 
@@ -146,11 +146,11 @@ parse_server_arguments() {
 		    sbindir="$basedir/sbin"
                     if test -f "$basedir/sbin/mysqld"
                     then
-                      libexecdir="$basedir/sbin"
+                      bindir="$basedir/sbin"
                     else
-                      libexecdir="$basedir/libexec"
+                      bindir="$basedir/bin"
                     fi
-		    #libexecdir="$basedir/libexec"
+		    #bindir="$basedir/bin"
         ;;
       --datadir=*)  datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
 		    datadir_set=1
@@ -338,7 +338,7 @@ case "$mode" in
     then
       # Give extra arguments to mysqld with the my.cnf file. This script
       # may be overwritten at next upgrade.
-      $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "--ledir=$libexecdir" "$@" >/dev/null 2>&1 &
+      $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "--ledir=$bindir" "$@" >/dev/null 2>&1 &
       wait_for_ready; return_value=$?
 
       # Make lock for RedHat / SuSE
@@ -421,7 +421,7 @@ case "$mode" in
       fi
     else
       # Try to find appropriate mysqld process
-      mysqld_pid=`pidof $libexecdir/mysqld`
+      mysqld_pid=`pidof $bindir/mysqld`
 
       # test if multiple pids exist
       pid_count=`echo $mysqld_pid | wc -w`
@@ -446,9 +446,9 @@ case "$mode" in
     cd $basedir
     echo $echo_n "Testing MySQL configuration syntax"
     daemon=$bindir/mysqld
-    if test -x $libexecdir/mysqld
+    if test -x $bindir/mysqld
     then
-      daemon=$libexecdir/mysqld
+      daemon=$bindir/mysqld
     elif test -x $sbindir/mysqld
     then
       daemon=$sbindir/mysqld