* bzr merge -rtag:mariadb-10.0.9 maria/10.0

* Fix for post-merge build failures.

9 files changed, 131 insertions, 95 deletions

diff --git a/cmake/CPackRPM.cmake b/cmake/CPackRPM.cmake
new file mode 100644
index 00000000000..1d22387d098
--- /dev/null
+++ b/cmake/CPackRPM.cmake
@@ -0,0 +1,16 @@
+#
+# Wrapper for CPackRPM.cmake
+#
+
+# load the original CPackRPM.cmake
+set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
+unset(CMAKE_MODULE_PATH)
+include(CPackRPM)
+set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})
+
+# per-component cleanup
+foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV AUTOREQ AUTOREQPROV)
+  unset(TMP_RPM_${_RPM_SPEC_HEADER})
+  unset(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP)
+endforeach()
+
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index ebca9f14c31..1d77da2710b 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -47,10 +47,10 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS)
   )
   
   IF(NOT ARG_COMPONENT)
-    MESSAGE(FATAL_ERROR "No COMPONENT passed to  INSTALL_DEBUG_SYMBOLS")
+    SET(ARG_COMPONENT DebugBinaries)
   ENDIF()
   IF(NOT ARG_INSTALL_LOCATION)
-    MESSAGE(FATAL_ERROR "No INSTALL_LOCATION passed to INSTALL_DEBUG_SYMBOLS")
+    SET(ARG_INSTALL_LOCATION lib)
   ENDIF()
   SET(targets ${ARG_DEFAULT_ARGS})
   FOREACH(target ${targets})
@@ -420,6 +420,7 @@ FUNCTION(INSTALL_MYSQL_TEST from to)
       PATTERN "*.vcxproj.filters" EXCLUDE
       PATTERN "*.vcxproj.user" EXCLUDE
       PATTERN "CTest" EXCLUDE
+      PATTERN "*~" EXCLUDE
     )
   ENDIF()
 ENDFUNCTION()
diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake
index bc6bf60781d..b677f226266 100644
--- a/cmake/jemalloc.cmake
+++ b/cmake/jemalloc.cmake
@@ -46,13 +46,14 @@ ELSE()
 ENDIF()
 
 SET(WITH_JEMALLOC ${WITH_JEMALLOC_DEFAULT} CACHE STRING
-    "Which jemalloc to use (possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
+    "Which jemalloc to use. Possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
 
 MACRO (CHECK_JEMALLOC)
   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
     CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
     IF (HAVE_JEMALLOC)
       SET(LIBJEMALLOC jemalloc)
+      SET(MALLOC_LIBRARY "system jemalloc")
     ELSEIF (WITH_JEMALLOC STREQUAL "system")
       MESSAGE(FATAL_ERROR "system jemalloc is not found")
     ELSEIF (WITH_JEMALLOC STREQUAL "yes")
@@ -61,5 +62,6 @@ MACRO (CHECK_JEMALLOC)
   ENDIF()
   IF(WITH_JEMALLOC STREQUAL "bundled" OR trybundled)
     USE_BUNDLED_JEMALLOC()
+    SET(MALLOC_LIBRARY "bundled jemalloc")
   ENDIF()
 ENDMACRO()
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake
index b1e1d3129e6..0c93fb179f5 100644
--- a/cmake/mysql_add_executable.cmake
+++ b/cmake/mysql_add_executable.cmake
@@ -1,48 +1,48 @@
-# Copyright (c) 2009, 2010, 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

-# the Free Software Foundation; version 2 of the License.

-#

-# This program is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU General Public License for more details.

-#

-# You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software

-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

-

-# Add executable plus some additional MySQL specific stuff

-# Usage (same as for standard CMake's ADD_EXECUTABLE)

-#

-# MYSQL_ADD_EXECUTABLE(target source1...sourceN)

-#

-# MySQL specifics:

-# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory

-# On Windows :

-# - add version resource

-# - instruct CPack to do autenticode signing if SIGNCODE is set

-

-INCLUDE(cmake_parse_arguments)

-

-FUNCTION (MYSQL_ADD_EXECUTABLE)

-  # Pass-through arguments for ADD_EXECUTABLE

-  MYSQL_PARSE_ARGUMENTS(ARG

-   "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"

-   ""

-   ${ARGN}

-  )

-  LIST(GET ARG_DEFAULT_ARGS 0 target)

-  LIST(REMOVE_AT  ARG_DEFAULT_ARGS 0)

-  

-  SET(sources ${ARG_DEFAULT_ARGS})

-  ADD_VERSION_INFO(${target} EXECUTABLE sources)

-  ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources})

-  # tell CPack where to install

-  IF(NOT ARG_EXCLUDE_FROM_ALL)

-    IF(NOT ARG_DESTINATION)

-      SET(ARG_DESTINATION ${INSTALL_BINDIR})

+# Copyright (c) 2009, 2010, 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
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# Add executable plus some additional MySQL specific stuff
+# Usage (same as for standard CMake's ADD_EXECUTABLE)
+#
+# MYSQL_ADD_EXECUTABLE(target source1...sourceN)
+#
+# MySQL specifics:
+# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory
+# On Windows :
+# - add version resource
+# - instruct CPack to do autenticode signing if SIGNCODE is set
+
+INCLUDE(cmake_parse_arguments)
+
+FUNCTION (MYSQL_ADD_EXECUTABLE)
+  # Pass-through arguments for ADD_EXECUTABLE
+  MYSQL_PARSE_ARGUMENTS(ARG
+   "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"
+   ""
+   ${ARGN}
+  )
+  LIST(GET ARG_DEFAULT_ARGS 0 target)
+  LIST(REMOVE_AT  ARG_DEFAULT_ARGS 0)
+  
+  SET(sources ${ARG_DEFAULT_ARGS})
+  ADD_VERSION_INFO(${target} EXECUTABLE sources)
+  ADD_EXECUTABLE(${target} ${ARG_WIN32} ${ARG_MACOSX_BUNDLE} ${ARG_EXCLUDE_FROM_ALL} ${sources})
+  # tell CPack where to install
+  IF(NOT ARG_EXCLUDE_FROM_ALL)
+    IF(NOT ARG_DESTINATION)
+      SET(ARG_DESTINATION ${INSTALL_BINDIR})
     ENDIF()
     IF(ARG_COMPONENT)
       SET(COMP COMPONENT ${ARG_COMPONENT})
@@ -50,7 +50,7 @@ FUNCTION (MYSQL_ADD_EXECUTABLE)
       SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT})
     ELSE()
       SET(COMP COMPONENT Client)
-    ENDIF()

-    MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})

-  ENDIF()

+    ENDIF()
+    MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})
+  ENDIF()
 ENDFUNCTION()
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake
index 36d7ade66a7..b0680d92a1b 100644
--- a/cmake/os/Linux.cmake
+++ b/cmake/os/Linux.cmake
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, 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
@@ -34,7 +34,10 @@ ENDFOREACH()
 
 # Ensure we have clean build for shared libraries
 # without unresolved symbols
-SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")
+# Not supported with AddressSanitizer
+IF(NOT WITH_ASAN)
+  SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined")
+ENDIF()
 
 # 64 bit file offset support flag
 SET(_FILE_OFFSET_BITS 64)
diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake
new file mode 100644
index 00000000000..45d9bc01ddb
--- /dev/null
+++ b/cmake/pcre.cmake
@@ -0,0 +1,16 @@
+SET(WITH_PCRE "auto" CACHE STRING
+   "Which pcre to use (possible values are 'bundled', 'system', or 'auto')")
+
+MACRO (CHECK_PCRE)
+  IF(WITH_PCRE STREQUAL "system" OR WITH_PCRE STREQUAL "auto")
+    CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE)
+  ENDIF()
+  IF(NOT HAVE_PCRE)
+    IF (WITH_PCRE STREQUAL "system")
+      MESSAGE(FATAL_ERROR "system pcre is not found or unusable")
+    ENDIF()
+    SET(PCRE_INCLUDES ${CMAKE_BINARY_DIR}/pcre ${CMAKE_SOURCE_DIR}/pcre)
+    ADD_SUBDIRECTORY(pcre)
+  ENDIF()
+ENDMACRO()
+
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index d0847f1f84e..07372849a10 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -37,8 +37,7 @@ MACRO(MYSQL_ADD_PLUGIN)
   # Add common include directories
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                     ${CMAKE_SOURCE_DIR}/sql
-                    ${CMAKE_BINARY_DIR}/pcre
-                    ${CMAKE_SOURCE_DIR}/pcre
+                    ${PCRE_INCLUDES}
                     ${SSL_INCLUDE_DIRS}
                     ${ZLIB_INCLUDE_DIR})
 
diff --git a/cmake/versioninfo.rc.in b/cmake/versioninfo.rc.in
index 6eb853936d2..cd880b917e0 100644
--- a/cmake/versioninfo.rc.in
+++ b/cmake/versioninfo.rc.in
@@ -1,38 +1,38 @@
-// Copyright (c) 2009, 2010, 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

-// the Free Software Foundation; version 2 of the License.

-// 

-// This program is distributed in the hope that it will be useful,

-// but WITHOUT ANY WARRANTY; without even the implied warranty of

-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-// GNU General Public License for more details.

-// 

-// You should have received a copy of the GNU General Public License

-// along with this program; if not, write to the Free Software

-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

-

-#include <windows.h>

-VS_VERSION_INFO VERSIONINFO

-FILEVERSION     @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@

-PRODUCTVERSION  @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@

-FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK

-FILEFLAGS       0

-FILEOS          VOS__WINDOWS32

-FILETYPE        @FILETYPE@

-FILESUBTYPE     VFT2_UNKNOWN

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "040904E4"

-        BEGIN

-            VALUE "FileVersion",      "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"

-            VALUE "ProductVersion",   "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x409, 1252

-    END

-END

+// Copyright (c) 2009, 2010, 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
+// the Free Software Foundation; version 2 of the License.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#include <windows.h>
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@
+PRODUCTVERSION  @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_VERSION@,@TINY_VERSION@
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEFLAGS       0
+FILEOS          VOS__WINDOWS32
+FILETYPE        @FILETYPE@
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "FileVersion",      "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"
+            VALUE "ProductVersion",   "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
index d2e78dd7049..03d2c542ba4 100644
--- a/cmake/zlib.cmake
+++ b/cmake/zlib.cmake
@@ -1,5 +1,4 @@
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2013, 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