database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge branch 'master' of https://github.com/davidhilldallas/InfiniDB_MariaDB

Browse Source
This commit is contained in:
David Hall
2016-05-24 01:07:14 -05:00
parent 4ba6ce790e 276ff9b819
commit 9adb467296
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/columnstore.spec.in
View File

@ -370,7 +370,7 @@ prefix=/usr/local
test -x /usr/local/MariaDB/Columnstore/bin/post-install && /usr/local/MariaDB/Columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode test -x /usr/local/MariaDB/Columnstore/bin/post-install && /usr/local/MariaDB/Columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode
echo "InfinIDB RPM install completed" echo "MariaDB ColumnStore RPM install completed"
%post libs %post libs
rpmmode=install rpmmode=install
@ -382,7 +382,7 @@ fi
prefix=/usr/local prefix=/usr/local
echo "InfinIDB RPM install completed" echo "MariaDB ColumnStore RPM install completed"
%post storage-engine %post storage-engine
rpmmode=install rpmmode=install
@ -394,7 +394,7 @@ fi
prefix=/usr/local prefix=/usr/local
echo "InfinIDB RPM install completed" echo "MariaDB ColumnStore RPM install completed"
%post enterprise %post enterprise
@ -407,7 +407,7 @@ fi
prefix=/usr/local prefix=/usr/local
echo "InfinIDB RPM install completed" echo "MariaDB ColumnStore RPM install completed"
%preun platform %preun platform
rpmmode=upgrade rpmmode=upgrade

2
dbcon/mysql/install_calpont_mysql.sh
View File

@ -28,6 +28,8 @@ done
df=$installdir/mysql/my.cnf df=$installdir/mysql/my.cnf
$installdir/mysql/bin/mysql --defaults-file=$df --force --user=root $pwprompt mysql 2>/tmp/mysql_install.log <<EOD $installdir/mysql/bin/mysql --defaults-file=$df --force --user=root $pwprompt mysql 2>/tmp/mysql_install.log <<EOD
INSTALL PLUGIN columnstore SONAME 'libcalmysql.so';
$installdir/mysql/bin/mysql --defaults-file=$df --force --user=root $pwprompt mysql 2>>/tmp/mysql_install.log <<EOD
INSTALL PLUGIN infinidb SONAME 'libcalmysql.so'; INSTALL PLUGIN infinidb SONAME 'libcalmysql.so';
-- these are deprecated names -- these are deprecated names
DELETE FROM mysql.func WHERE name='caldisablepartition'; DELETE FROM mysql.func WHERE name='caldisablepartition';