Merge branch '10.1' of github.com:MariaDB/server into 10.1

Author: spetrunia

CMakeLists.txt

@@ -230,7 +230,6 @@ MARK_AS_ADVANCED(WITH_FAST_MUTEXES)
 
 OPTION(WITH_INNODB_DISALLOW_WRITES "InnoDB freeze writes patch from Google" ${WITH_WSREP})
 IF (WITH_INNODB_DISALLOW_WRITES)
-  MESSAGE(STATUS "INNODB_DISALLOW_WRITES")
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_INNODB_DISALLOW_WRITES")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_INNODB_DISALLOW_WRITES")
 ENDIF()

cmake/abi_check.cmake

@@ -44,7 +44,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND RUN_ABI_CHECK)
     ${CMAKE_SOURCE_DIR}/include/mysql/client_plugin.h
     ${CMAKE_SOURCE_DIR}/include/mysql/plugin_auth.h
     ${CMAKE_SOURCE_DIR}/include/mysql/plugin_password_validation.h
-    ${CMAKE_SOURCE_DIR}/include/mysql/plugin_encryption_key_management.h
+    ${CMAKE_SOURCE_DIR}/include/mysql/plugin_encryption.h
   )
 
   ADD_CUSTOM_TARGET(abi_check ALL

cmake/check_compiler_flag.cmake

@@ -37,16 +37,16 @@ FUNCTION(MY_CHECK_AND_SET_COMPILER_FLAG flag)
   ENDIF()
   MY_CHECK_C_COMPILER_FLAG(${flag} HAVE_C_${flag})
   MY_CHECK_CXX_COMPILER_FLAG(${flag} HAVE_CXX_${flag})
-  IF (HAVE_C_${flag} AND HAVE_CXX_${flag})
-    IF(ARGN)
-      FOREACH(type ${ARGN})
-        SET(CMAKE_C_FLAGS_${type} "${CMAKE_C_FLAGS_${type}} ${flag}" PARENT_SCOPE)
-        SET(CMAKE_CXX_FLAGS_${type} "${CMAKE_CXX_FLAGS_${type}} ${flag}" PARENT_SCOPE)
-      ENDFOREACH()
-    ELSE()
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}" PARENT_SCOPE)
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" PARENT_SCOPE)
+  FOREACH(lang C CXX)
+    IF (HAVE_${lang}_${flag})
+      IF(ARGN)
+        FOREACH(type ${ARGN})
+          SET(CMAKE_${lang}_FLAGS_${type} "${CMAKE_${lang}_FLAGS_${type}} ${flag}" PARENT_SCOPE)
+        ENDFOREACH()
+      ELSE()
+        SET(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} ${flag}" PARENT_SCOPE)
+      ENDIF()
     ENDIF()
-  ENDIF()
+  ENDFOREACH()
 ENDFUNCTION()
 

debian/dist/Debian/mariadb-server-10.1.files.in

@@ -1,5 +1,6 @@
 usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/file_key_management.so
 usr/lib/mysql/plugin/ha_archive.so
 usr/lib/mysql/plugin/ha_blackhole.so
 usr/lib/mysql/plugin/ha_federated.so

debian/dist/Ubuntu/mariadb-server-10.1.files.in

@@ -1,5 +1,6 @@
 usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
+usr/lib/mysql/plugin/file_key_management.so
 usr/lib/mysql/plugin/ha_archive.so
 usr/lib/mysql/plugin/ha_blackhole.so
 usr/lib/mysql/plugin/ha_federated.so

debian/mariadb-test-10.1.files

@@ -1,3 +1,5 @@
+usr/lib/mysql/plugin/debug_key_management.so
+usr/lib/mysql/plugin/example_key_management.so
 usr/lib/mysql/plugin/dialog_examples.so
 usr/lib/mysql/plugin/auth_test_plugin.so
 usr/lib/mysql/plugin/qa_auth_interface.so

include/my_aes.h

@@ -354,8 +354,7 @@ enum ha_base_keytype {
 #define HA_CREATE_DELAY_KEY_WRITE 64
 #define HA_CREATE_RELIES_ON_SQL_LAYER 128
 #define HA_CREATE_INTERNAL_TABLE 256
-#define HA_CREATE_ENCRYPTED      512
-#define HA_INSERT_ORDER         1024
+#define HA_PRESERVE_INSERT_ORDER 512
 
 /* Flags used by start_bulk_insert */