# Source
|
anel@anel:~/mariadb/10.6$ git clean -dffx
|
anel@anel:~/mariadb/10.6$ git status
|
On branch bb-10.6-anel-marko
|
Changes not staged for commit:
|
(use "git add <file>..." to update what will be committed)
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
(commit or discard the untracked or modified content in submodules)
|
modified: extra/wolfssl/wolfssl (untracked content)
|
modified: storage/connect/CMakeLists.txt
|
no changes added to commit (use "git add" and/or "git commit -a")
|
anel@anel:~/mariadb/10.6$ git diff
|
diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl
|
--- a/extra/wolfssl/wolfssl
|
+++ b/extra/wolfssl/wolfssl
|
@@ -1 +1 @@
|
-Subproject commit 9c87f979a7f1d3a6d786b260653d566c1d31a1c4
|
+Subproject commit 9c87f979a7f1d3a6d786b260653d566c1d31a1c4-dirty
|
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
|
index ebb61bb487b..e96598c1c59 100644
|
--- a/storage/connect/CMakeLists.txt
|
+++ b/storage/connect/CMakeLists.txt
|
@@ -13,6 +13,10 @@
|
# along with this program; if not, write to the Free Software
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
|
+IF(WITHOUT_DYNAMIC_PLUGINS OR WITH_NONE OR (PLUGIN_${name} STREQUAL "NO"))
|
+ RETURN()
|
+ENDIF()
|
+
|
SET(CONNECT_PLUGIN_STATIC "connect")
|
SET(CONNECT_PLUGIN_DYNAMIC "connect")
|
# BUILDS:
|
anel@anel:~/mariadb/builds/10.6$ rm -rf ./*
|
anel@anel:~/mariadb/builds/10.6$ cmake ../../10.6 -DCMAKE_BUILD_TYPE=Debug -DCONC_WITH_{UNITTEST,SSL}=OFF -DWITH_EMBEDDED_SERVER=OFF -DWITH_UNIT_TESTS=OFF -DPLUGIN_{ARCHIVE,TOKUDB,MROONGA,OQGRAPH,ROCKSDB,CONNECT,PERFSCHEMA,SPIDER,SPHINX}=NO -DWITH_SAFEMALLOC=OFF -DWITH_SSL=bundled -DENABLE_GCOV=OFF -G Ninja --trace-expand --trace-redirect=./cmakeninjaoos_full
|
anel@anel:~/mariadb/builds/10.6$ ninja
|
JAVA_INCLUDE_PATH (ADVANCED)
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
JAVA_INCLUDE_PATH2 (ADVANCED)
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|
used as include directory in directory /home/anel/mariadb/10.6/storage/connect
|