mysql-5.5.29 merge

7 files changed, 31 insertions, 9 deletions

diff --git a/cmake/configure.pl b/cmake/configure.pl
index 1217d314d72..51e83c2815c 100644
--- a/cmake/configure.pl
+++ b/cmake/configure.pl
@@ -227,6 +227,16 @@ foreach my $option (@ARGV)
       $cmakeargs = $cmakeargs." -DCMAKE_VERBOSE_MAKEFILE=1";
       next;
   }
+  if ($option =~ /with-client-ldflags/)
+  {
+      print("configure.pl : ignoring $option\n");
+      next;
+  }
+  if ($option =~ /with-mysqld-ldflags=/)
+  {
+      print("configure.pl : ignoring $option\n");
+      next;
+  }
 
   $option = uc($option);
   $option =~ s/-/_/g;
diff --git a/cmake/create_initial_db.cmake.in b/cmake/create_initial_db.cmake.in
index e37f41255e0..fba6209d147 100644
--- a/cmake/create_initial_db.cmake.in
+++ b/cmake/create_initial_db.cmake.in
@@ -69,10 +69,13 @@ EXECUTE_PROCESS(
   COMMAND "@CMAKE_COMMAND@" -E echo Executing ${BOOTSTRAP_COMMAND}
 )
 EXECUTE_PROCESS (
-  COMMAND "@CMAKE_COMMAND@" -E echo input file bootstrap.sql, current directory ${CWD}
+  COMMAND "@CMAKE_COMMAND@" -E
+  echo input file bootstrap.sql, current directory ${CWD}
 )
 EXECUTE_PROCESS (  
-  COMMAND ${BOOTSTRAP_COMMAND}  INPUT_FILE bootstrap.sql OUTPUT_VARIABLE OUT
+  COMMAND ${BOOTSTRAP_COMMAND}
+  INPUT_FILE bootstrap.sql
+  OUTPUT_VARIABLE OUT
   ERROR_VARIABLE ERR
   RESULT_VARIABLE RESULT
  )
@@ -81,3 +84,6 @@ IF(NOT RESULT EQUAL 0)
   MESSAGE(FATAL_ERROR "Could not create initial database \n ${OUT} \n ${ERR}")
 ENDIF()
  
+EXECUTE_PROCESS (  
+  COMMAND "@CMAKE_COMMAND@" -E touch ${CMAKE_CURRENT_BINARY_DIR}/initdb.dep
+)
diff --git a/cmake/info_macros.cmake.in b/cmake/info_macros.cmake.in
index 9e08cffb2bf..9f40a419c61 100644
--- a/cmake/info_macros.cmake.in
+++ b/cmake/info_macros.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -82,9 +82,11 @@ MACRO(CREATE_INFO_BIN)
 
   FILE(WRITE ${INFO_BIN} "===== Information about the build process: =====\n")
   IF (WIN32)
-    EXECUTE_PROCESS(COMMAND cmd /c date /T OUTPUT_VARIABLE TMP_DATE)
+    EXECUTE_PROCESS(COMMAND cmd /c date /T
+        OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
   ELSEIF(UNIX)
-    EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+    EXECUTE_PROCESS(COMMAND date "+%Y-%m-%d %H:%M:%S"
+        OUTPUT_VARIABLE TMP_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
   ELSE()
     SET(TMP_DATE "(no date command known for this platform)")
   ENDIF()
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 3ad6da5d433..0542b8d2e21 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -100,7 +100,10 @@ ENDIF()
 # just use if(INSTALL_PLUGINTESTDIR).
 # The plugin must set its own install path for tests
 #
-FILE(GLOB plugin_tests ${CMAKE_SOURCE_DIR}/plugin/*/tests)
+FILE(GLOB plugin_tests
+  ${CMAKE_SOURCE_DIR}/plugin/*/tests
+  ${CMAKE_SOURCE_DIR}/internal/plugin/*/tests
+)
 
 #
 # STANDALONE layout
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
index 33aa33c9e5b..021e7ab4ae8 100644
--- a/cmake/mysql_version.cmake
+++ b/cmake/mysql_version.cmake
@@ -54,7 +54,7 @@ MACRO(GET_MYSQL_VERSION)
   ENDIF()
 
   SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
-  MESSAGE("-- MariaDB ${VERSION}")
+  MESSAGE(STATUS "MariaDB ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
   SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
   # Use NDBVERSION irregardless of whether this is Cluster or not, if not
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index 5c99a110e7c..93e7d968b2a 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -130,7 +130,7 @@ IF(NOT VERSION)
     SET(package_name "mariadb${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
   ENDIF()
 
-  MESSAGE("-- Packaging as: ${package_name}")
+  MESSAGE(STATUS "Packaging as: ${package_name}")
 
   # Sometimes package suffix is added (something like "-icc-glibc23")
   IF(PACKAGE_SUFFIX)
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 524f368c6d7..2978fb1a13c 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -39,6 +39,7 @@ MACRO(PLUGIN_APPEND_COLLECTIONS plugin)
       GET_FILENAME_COMPONENT(fname ${cfile} NAME)
       FILE(APPEND ${CMAKE_SOURCE_DIR}/mysql-test/collections/${fname} "${contents}")
       FILE(APPEND ${fcopied} "${fname}\n")
+      MESSAGE(STATUS "Appended ${cfile}")
     ENDFOREACH()
   ENDIF()
 ENDMACRO()