You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-08-01 06:46:55 +03:00
Fix my.cnf clash
This patch: * Moves ColumnStore my.cnf to /etc/my.cnf.d/columnstore.cnf * Removes unneeded entries from columnstore.cnf * Removes some things that used my.cnf and are now dead * Also removes utils/scenarios * Modifies things that use extra defaults file to use the standard one * Makes sure that C++11 standard is used for older CMake versions With this patch we no longer need to set -DINSTALL_SYSCONF2DIR and -DINSTALL_SYSCONFDIR when building MariaDB server.
This commit is contained in:
@ -23,7 +23,6 @@ checkForError() {
|
||||
#---------------------------------------------------------------------------
|
||||
echo "checking for engine columnstore..."
|
||||
$installdir/mysql/bin/mysql \
|
||||
--defaults-extra-file=$installdir/mysql/my.cnf \
|
||||
--user=root \
|
||||
--execute='select * from mysql.plugin where name="columnstore";' \
|
||||
calpontsys | grep -i columnstore
|
||||
@ -92,7 +91,7 @@ if [ -d $installdir/mysql/lib64/mysql/plugin -a -n "$libcalmysql" ]; then
|
||||
fi
|
||||
|
||||
if [ $installdir != "/usr/local/mariadb/columnstore" ]; then
|
||||
sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/mysql/my.cnf
|
||||
sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g /etc/my.cnf.d/columnstore.cnf
|
||||
fi
|
||||
|
||||
if [ -x $installdir/mysql/mysql-Columnstore ]; then
|
||||
|
Reference in New Issue
Block a user