mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update Mroonga to the latest version on 2015-07-02T04:12:21+0900

Browse source
This commit is contained in:
Kentoku SHIBA 2015-07-02 04:12:21 +09:00
commit 06913d0162
329 changed files with 11202 additions and 2138 deletions
Download patch file Download diff file Expand all files Collapse all files

29
storage/mroonga/tools/travis/before_script.sh
View file

@ -20,9 +20,26 @@
set -e
if [ "${MROONGA_BUNDLED}" = "yes" ]; then
cmake_args=(-DCMAKE_BUILD_TYPE=Debug)
cmake_args=(-DCMAKE_BUILD_TYPE=Debug -DWITH_UNIT_TESTS=FALSE)
cmake_args=("${cmake_args[@]}" -DWITH_EMBEDDED_SERVER=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_ARCHIVE=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_BLACKHOLE=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_CASSANDRA=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_CONNECT=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_CSV=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_EXAMPLE=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_FEDERATED=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_FEDERATEDX=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_HEAP=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_MYISAMMRG=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_OQGRAPH=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_SEQUENCE=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_SPHINX=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_SPIDER=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_TEST_SQL_DISCOVERY=TRUE)
cmake_args=("${cmake_args[@]}" -DWITHOUT_TOKUDB=TRUE)
if [ "${MROONGA_TEST_EMBEDDED}" = "yes" ]; then
cmake_args=("${cmake_args[@]}" "-DWITH_EMBEDDED_SERVER=TRUE")
cmake_args=("${cmake_args[@]}" -DWITH_EMBEDDED_SERVER=TRUE)
fi
cmake . "${cmake_args[@]}"
else
@ -31,6 +48,10 @@ else
if [ -d /opt/mysql/ ]; then
PATH=$(echo /opt/mysql/server-*/bin/):$PATH
fi
./configure \
--with-mysql-source=$PWD/vendor/mysql
configure_args=("--with-mysql-source=$PWD/vendor/mysql")
if [ "${MYSQL_VERSION}" = "mysql-5.6.25" ]; then
configure_args=("${configure_args[@]}" --enable-fast-mutexes)
fi
./configure "${configure_args[@]}"
cat "$(mysql_config --include | sed -e 's/-I//g')/my_config.h"
fi

14
storage/mroonga/tools/travis/script.sh
View file

@ -32,7 +32,11 @@ else
fi
n_processors="$(grep '^processor' /proc/cpuinfo | wc -l)"
max_n_processors=8
if [ "${MROONGA_BUNDLED}" = "yes" ]; then
max_n_processors=2
else
max_n_processors=4
fi
if (( $n_processors > $max_n_processors )); then
n_processors=$max_n_processors
fi
@ -98,6 +102,14 @@ run_sql_test()
fi
if [ "${MROONGA_BUNDLED}" = "yes" ]; then
# Plugins aren't supported.
cd ${mroonga_dir}/mysql-test/mroonga/storage
rm -rf alter_table/add_index/token_filters/
rm -rf alter_table/t/change_token_filter.test
rm -rf create/table/token_filters/
rm -rf fulltext/token_filters/
cd -
${mroonga_dir}/test/run-sql-test.sh \
"${test_args[@]}" \
--parallel="${n_processors}"