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

Merge branch 'develop' into MCOL-4126

Browse Source
This commit is contained in:
David Hall
2020-07-02 10:41:16 -05:00
parent 085b06d422 d9a8f5fd3c
commit 734801846a
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/postUn_storage_engine.sh
View File

@@ -16,7 +16,7 @@ else
fi fi
if [ $rpmmode = erase ]; then if [ $rpmmode = erase ]; then
if [ ! -z "$(pgrep -x mysqld)" ];then if [ ! -z "$(pgrep -x mariadbd)" ];then
systemctl cat mariadb.service > /dev/null 2>&1 systemctl cat mariadb.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl restart mariadb.service > /dev/null 2>&1 systemctl restart mariadb.service > /dev/null 2>&1

3
dbcon/mysql/CMakeLists.txt
View File

@@ -48,6 +48,9 @@ else ()
target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool) target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine) install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine)
# define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist)
add_custom_target(columnstore DEPENDS ha_columnstore)
endif () endif ()
install(FILES syscatalog_mysql.sql install(FILES syscatalog_mysql.sql

2
oam/install_scripts/columnstore-post-install.in
View File

@@ -68,7 +68,7 @@ user=`whoami 2>/dev/null`
quiet=0 quiet=0
stop_mysqld=0 stop_mysqld=0
if [ -z "$(pgrep -x mysqld)" ];then if [ -z "$(pgrep -x mariadbd)" ];then
# Startup mysqld # Startup mysqld
systemctl cat mariadb.service > /dev/null 2>&1 systemctl cat mariadb.service > /dev/null 2>&1