database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

MCOL64 more directory name changes

Browse Source
This commit is contained in:
david hill
2016-06-16 21:51:42 +00:00
parent ef2697d370
commit df3d259f38
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/mysql/my.cnf
View File

@@ -63,9 +63,9 @@ infinidb_use_import_for_batchinsert=1
infinidb_import_for_batchinsert_delimiter=7 infinidb_import_for_batchinsert_delimiter=7
basedir = /usr/local/mariadb/columnstore/mysql/ basedir = /usr/local/mariadb/columnstore/mysql/
character-sets-dir = /usr/local/mariadb/columnstore/mysql/share/mysql/charsets/ character-sets-dir = /usr/local/mariadb/columnstore/mysql/share/charsets/
language = /usr/local/mariadb/columnstore/mysql/share/mysql/english/ language = /usr/local/mariadb/columnstore/mysql/share/english/
plugin_dir = /usr/local/mariadb/columnstore/mysql/lib64/mysql/plugin 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, # 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. # if all processes that need to connect to mysqld run on the same host.

20
dbcon/mysql/mysql-Columnstore
View File

@@ -80,7 +80,7 @@ then
datadir=/var/lib/mysql datadir=/var/lib/mysql
fi fi
sbindir=/usr/local/sbin sbindir=/usr/local/sbin
libexecdir=/usr/local/sbin bindir=/usr/local/sbin
else else
bindir="$basedir/bin" bindir="$basedir/bin"
if test -z "$datadir" if test -z "$datadir"
@@ -90,9 +90,9 @@ else
sbindir="$basedir/sbin" sbindir="$basedir/sbin"
if test -f "$basedir/sbin/mysqld" if test -f "$basedir/sbin/mysqld"
then then
libexecdir="$basedir/sbin" bindir="$basedir/sbin"
else else
libexecdir="$basedir/libexec" bindir="$basedir/bin"
fi fi
fi fi
@@ -146,11 +146,11 @@ parse_server_arguments() {
sbindir="$basedir/sbin" sbindir="$basedir/sbin"
if test -f "$basedir/sbin/mysqld" if test -f "$basedir/sbin/mysqld"
then then
libexecdir="$basedir/sbin" bindir="$basedir/sbin"
else else
libexecdir="$basedir/libexec" bindir="$basedir/bin"
fi fi
#libexecdir="$basedir/libexec" #bindir="$basedir/bin"
;; ;;
--datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
datadir_set=1 datadir_set=1
@@ -338,7 +338,7 @@ case "$mode" in
then then
# Give extra arguments to mysqld with the my.cnf file. This script # Give extra arguments to mysqld with the my.cnf file. This script
# may be overwritten at next upgrade. # 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=$? wait_for_ready; return_value=$?
# Make lock for RedHat / SuSE # Make lock for RedHat / SuSE
@@ -421,7 +421,7 @@ case "$mode" in
fi fi
else else
# Try to find appropriate mysqld process # Try to find appropriate mysqld process
mysqld_pid=`pidof $libexecdir/mysqld` mysqld_pid=`pidof $bindir/mysqld`
# test if multiple pids exist # test if multiple pids exist
pid_count=`echo $mysqld_pid | wc -w` pid_count=`echo $mysqld_pid | wc -w`
@@ -446,9 +446,9 @@ case "$mode" in
cd $basedir cd $basedir
echo $echo_n "Testing MySQL configuration syntax" echo $echo_n "Testing MySQL configuration syntax"
daemon=$bindir/mysqld daemon=$bindir/mysqld
if test -x $libexecdir/mysqld if test -x $bindir/mysqld
then then
daemon=$libexecdir/mysqld daemon=$bindir/mysqld
elif test -x $sbindir/mysqld elif test -x $sbindir/mysqld
then then
daemon=$sbindir/mysqld daemon=$sbindir/mysqld