Merge branch '10.1' into 10.2

5 files changed, 14 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfd04884e53..e25c981e0da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -481,5 +481,5 @@ ENDIF()
 
 IF(NON_DISTRIBUTABLE_WARNING)
   MESSAGE(WARNING "
-You have linked MariaDB with GPLv3 libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with Free Software Foundation.")
+You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.")
 ENDIF()
diff --git a/cmake/readline.cmake b/cmake/readline.cmake
index 12a8980b6a9..f1c6f62e311 100644
--- a/cmake/readline.cmake
+++ b/cmake/readline.cmake
@@ -134,7 +134,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
         SET(USE_NEW_READLINE_INTERFACE 1)
       ELSE()
         IF(NOT_FOR_DISTRIBUTION)
-          SET(NON_DISTRIBUTABLE_WARNING 1)
+          SET(NON_DISTRIBUTABLE_WARNING "GPLv3")
           SET(USE_NEW_READLINE_INTERFACE 1)
         ELSE()
           SET(USE_NEW_READLINE_INTERFACE 0)
diff --git a/configure.cmake b/configure.cmake
index afd13e45a4e..01409074192 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -251,7 +251,7 @@ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DPACKAGE=test) # b
 CHECK_INCLUDE_FILES (bfd.h BFD_H_EXISTS)
 IF(BFD_H_EXISTS)
   IF(NOT_FOR_DISTRIBUTION)
-    SET(NON_DISTRIBUTABLE_WARNING 1)
+    SET(NON_DISTRIBUTABLE_WARNING "GPLv3")
     SET(HAVE_BFD_H 1)
   ENDIF()
 ENDIF()
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt
index aa93fc3aa03..e9e1b49d5f2 100644
--- a/plugin/aws_key_management/CMakeLists.txt
+++ b/plugin/aws_key_management/CMakeLists.txt
@@ -17,7 +17,9 @@ MACRO(SKIP_AWS_PLUGIN msg)
 ENDMACRO()
 SET(CMAKE_CXX_STANDARD 11)
 
-
+IF(NOT NOT_FOR_DISTRIBUTION)
+  SKIP_AWS_PLUGIN("AWS SDK has Apache 2.0 License which is not complatible with GPLv2. Set -DNOT_FOR_DISTRIBUTION=ON if you need this plugin")
+ENDIF()
 
 # This plugin needs recent C++ compilers (AWS C++ SDK header files are using C++11 features)
 SET(CXX11_FLAGS)
@@ -167,4 +169,6 @@ MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc
                  LINK_LIBRARIES ${AWS_SDK_LIBS} ${AWS_CPP_SDK_DEPENDENCIES}
                  COMPONENT aws-key-management)
 
-
+IF (TARGET aws_key_management)
+  SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" PARENT_SCOPE)  
+ENDIF()
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 681b73dfc9f..8bad8c4000b 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -303,6 +303,8 @@ fi
 parse_arguments `"$print_defaults" $defaults $defaults_group_suffix --mysqld mysql_install_db`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
+rel_mysqld="$dirname0/@INSTALL_SBINDIR@/mysqld"
+
 # Configure paths to support files
 if test -n "$srcdir"
 then
@@ -344,12 +346,12 @@ then
   fi
   plugindir=`find_in_dirs --dir auth_socket.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin`
 # relative from where the script was run for a relocatable install
-elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld"
+elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld"
 then
   basedir="$dirname0"
-  bindir="$basedir/@INSTALL_SBINDIR@"
+  bindir="$basedir/@INSTALL_BINDIR@"
   resolveip="$bindir/resolveip"
-  mysqld="$basedir/@INSTALL_SBINDIR@/mysqld"
+  mysqld="$rel_mysqld"
   srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
   buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
   plugindir="$basedir/@INSTALL_PLUGINDIR@"