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

fix(build) Remove _GLIBXX flags for Columnstore debug builds

Browse Source
This commit is contained in:
Leonid Fedorov
2024-07-04 14:56:51 +00:00
committed by Leonid Fedorov
parent 7dcb999e15
commit ae20481aed
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build/bootstrap_mcs.sh
View File

@ -351,15 +351,16 @@ build()
check_user_and_group()
{
if [ -z "$(grep mysql /etc/passwd)" ]; then
message "Adding user mysql into /etc/passwd"
useradd -r -U mysql -d /var/lib/mysql
user=$1
if [ -z "$(grep $user /etc/passwd)" ]; then
message "Adding user $user into /etc/passwd"
useradd -r -U $user -d /var/lib/mysql
fi
if [ -z "$(grep mysql /etc/group)" ]; then
if [ -z "$(grep $user /etc/group)" ]; then
GroupID = `awk -F: '{uid[$3]=1}END{for(x=100; x<=999; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/group`
message "Adding group mysql with id $GroupID"
groupadd -g GroupID mysql
message "Adding group $user with id $GroupID"
groupadd -g $GroupID $user
fi
}
@ -370,7 +371,7 @@ run_unit_tests()
warn "Skipping unittests"
else
message "Running unittests"
cd $MDB_SOURCE_PATH
cd $MARIA_BUILD_PATH
${CTEST_BIN_NAME} . -R columnstore: -j $(nproc) --progress
cd - > /dev/null
fi
@ -393,14 +394,12 @@ disable_plugins_for_bootstrap()
{
find /etc -type f -exec sed -i 's/plugin-load-add=auth_gssapi.so//g' {} +
find /etc -type f -exec sed -i 's/plugin-load-add=ha_columnstore.so//g' {} +
find /etc -type f -exec sed -i 's/columnstore_use_import_for_batchinsert = ON//g' {} +
}
enable_columnstore_back()
{
echo plugin-load-add=ha_columnstore.so >> $CONFIG_DIR/columnstore.cnf
sed -i '/\[mysqld\]/a\plugin-load-add=ha_columnstore.so' $CONFIG_DIR/columnstore.cnf
sed -i '/plugin-load-add=ha_columnstore.so/a\columnstore_use_import_for_batchinsert = ON' $CONFIG_DIR/columnstore.cnf
}
fix_config_files()
@ -466,7 +465,9 @@ install()
make_dir $REPORT_PATH
chmod 777 $REPORT_PATH
check_user_and_group
check_user_and_group mysql
check_user_and_group syslog
make_dir $CONFIG_DIR
@ -500,6 +501,7 @@ socket=/run/mysqld/mysqld.sock" > $CONFIG_DIR/socket.cnf
fix_config_files
make_dir /etc/my.cnf.d
if [ -d "/etc/mysql/mariadb.conf.d/" ]; then
message "Copying configs from /etc/mysql/mariadb.conf.d/ to /etc/my.cnf.d"
cp -rp /etc/mysql/mariadb.conf.d/* /etc/my.cnf.d