diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-05 16:12:54 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-05 16:12:54 +0400 |
| commit | ac53b49b1be807f588aebd83883ec93b764f5d54 (patch) | |
| tree | c86cbdb535eefb15e2077a7ac2ffaeff9d76955e /plugin | |
| parent | 583b68e89961c35fa95a06c38988f82e33c73f4a (diff) | |
| parent | db0917f68f2681882974afd53935aa8cba29c6b8 (diff) | |
| download | mariadb-git-ac53b49b1be807f588aebd83883ec93b764f5d54.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/aws_key_management/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | plugin/user_variables/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | plugin/user_variables/mysql-test/user_variables/basic.result | 2 | ||||
| -rw-r--r-- | plugin/user_variables/mysql-test/user_variables/suite.pm | 3 | ||||
| -rw-r--r-- | plugin/user_variables/user_variables.cc | 2 |
5 files changed, 15 insertions, 5 deletions
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index 59fdd1684f2..2202efe9e41 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -108,11 +108,19 @@ ELSE() SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION ${loc}) ENDFOREACH() + # To be compatible with older cmake, we use older version of the SDK + # We increase the version for macs however, so the newest mac could built it. + IF(APPLE) + SET(GIT_TAG "1.0.100") + ELSE() + SET(GIT_TAG "1.0.8") + ENDIF() + SET(AWS_SDK_PATCH_COMMAND ) ExternalProject_Add( aws_sdk_cpp GIT_REPOSITORY "https://github.com/awslabs/aws-sdk-cpp.git" - GIT_TAG "1.0.8" + GIT_TAG ${GIT_TAG} UPDATE_COMMAND "" SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp" ${byproducts} diff --git a/plugin/user_variables/CMakeLists.txt b/plugin/user_variables/CMakeLists.txt index b9ec7d18ba1..6638a5cb622 100644 --- a/plugin/user_variables/CMakeLists.txt +++ b/plugin/user_variables/CMakeLists.txt @@ -1 +1,2 @@ -MYSQL_ADD_PLUGIN(user_variables user_variables.cc) +MYSQL_ADD_PLUGIN(user_variables user_variables.cc + DEFAULT RECOMPILE_FOR_EMBEDDED) diff --git a/plugin/user_variables/mysql-test/user_variables/basic.result b/plugin/user_variables/mysql-test/user_variables/basic.result index 02de31b5e09..5650fa0dcce 100644 --- a/plugin/user_variables/mysql-test/user_variables/basic.result +++ b/plugin/user_variables/mysql-test/user_variables/basic.result @@ -7,7 +7,7 @@ PLUGIN_AUTHOR Sergey Vojtovich PLUGIN_DESCRIPTION User-defined variables PLUGIN_LICENSE GPL LOAD_OPTION ON -PLUGIN_MATURITY Alpha +PLUGIN_MATURITY Gamma SHOW CREATE TABLE INFORMATION_SCHEMA.USER_VARIABLES; Table Create Table user_variables CREATE TEMPORARY TABLE `user_variables` ( diff --git a/plugin/user_variables/mysql-test/user_variables/suite.pm b/plugin/user_variables/mysql-test/user_variables/suite.pm index ae757eedee4..b927bf40ecc 100644 --- a/plugin/user_variables/mysql-test/user_variables/suite.pm +++ b/plugin/user_variables/mysql-test/user_variables/suite.pm @@ -6,7 +6,8 @@ return "No USER_VARIABLES plugin" unless $ENV{USER_VARIABLES_SO} or $::mysqld_variables{'user-variables'} eq "ON"; -return "Not run for embedded server" if $::opt_embedded_server; +return "Not run for embedded server" if $::opt_embedded_server and + $ENV{USER_VARIABLES_SO}; sub is_default { 1 } diff --git a/plugin/user_variables/user_variables.cc b/plugin/user_variables/user_variables.cc index 981c39cdb86..9190b2effb7 100644 --- a/plugin/user_variables/user_variables.cc +++ b/plugin/user_variables/user_variables.cc @@ -134,6 +134,6 @@ maria_declare_plugin(user_variables) NULL, NULL, "1.0", - MariaDB_PLUGIN_MATURITY_ALPHA + MariaDB_PLUGIN_MATURITY_GAMMA } maria_declare_plugin_end; |