Merge branch '10.3' of https://github.com/mariadb/server into 10.3

Author: vaintroub

BUILD/SETUP.sh

@@ -308,3 +308,5 @@ gprof_compile_flags="-O2 -pg -g"
 gprof_link_flags="--disable-shared $static_link"
 
 disable_gprof_plugins="--with-zlib-dir=bundled --without-plugin-oqgraph --without-plugin-mroonga"
+
+disable_asan_plugins="--without-plugin-rocksdb"

BUILD/compile-pentium64-asan-max

@@ -18,7 +18,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium64_cflags $debug_cflags -lasan -O -g -fsanitize=address"
-extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs"
+extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs $disable_asan_plugins"
 export LDFLAGS="-ldl"
 
 . "$path/FINISH.sh"

cmake/build_configurations/mysql_release.cmake

@@ -62,7 +62,7 @@ IF(FEATURE_SET)
     SET(WITH_NONE ON)
   ENDIF()
 
-  IF(num GREATER FEATURE_SET_xsmall)
+  IF(num GREATER FEATURE_SET_xsmall AND NOT WIN32)
     SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
   ENDIF()
   IF(num GREATER FEATURE_SET_small)
@@ -88,7 +88,9 @@ ENDIF()
 OPTION(ENABLED_LOCAL_INFILE "" ON)
 SET(WITH_INNODB_SNAPPY OFF CACHE STRING "")
 IF(WIN32)
-  SET(WITH_LIBARCHIVE STATIC CACHE STRING "")
+  SET(INSTALL_MYSQLTESTDIR "" CACHE STRING "")
+  SET(INSTALL_SQLBENCHDIR  "" CACHE STRING "")
+  SET(INSTALL_SUPPORTFILESDIR ""  CACHE STRING "")
 ELSEIF(RPM)
   SET(WITH_SSL system CACHE STRING "")
   SET(WITH_ZLIB system CACHE STRING "")

cmake/os/Windows.cmake

@@ -86,8 +86,10 @@ IF(MSVC)
   # Enable debug info also in Release build,
   # and create PDB to be able to analyze crashes.
   FOREACH(type EXE SHARED MODULE)
-   SET(CMAKE_{type}_LINKER_FLAGS_RELEASE
+   SET(CMAKE_${type}_LINKER_FLAGS_RELEASE
      "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
+   SET(CMAKE_${type}_LINKER_FLAGS_MINSIZEREL
+     "${CMAKE_${type}_LINKER_FLAGS_MINSIZEREL} /debug")
   ENDFOREACH()
 
   # Force static runtime libraries
@@ -108,10 +110,15 @@ IF(MSVC)
    CMAKE_C_FLAGS_RELEASE    CMAKE_C_FLAGS_RELWITHDEBINFO 
    CMAKE_C_FLAGS_DEBUG      CMAKE_C_FLAGS_DEBUG_INIT 
    CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
-   CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT)
+   CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT
+   CMAKE_C_FLAGS_MINSIZEREL  CMAKE_CXX_FLAGS_MINSIZEREL
+   )
    STRING(REGEX REPLACE "/M[TD][d]?"  "${MSVC_CRT_TYPE}" "${flag}"  "${${flag}}" )
    STRING(REGEX REPLACE "/D[ ]?_DEBUG"  "" "${flag}" "${${flag}}")
    STRING(REPLACE "/Zi"  "/Z7" "${flag}" "${${flag}}")
+   IF(NOT "${${flag}}" MATCHES "/Z7")
+    STRING(APPEND ${flag} " /Z7")
+   ENDIF()
   ENDFOREACH()
 
 
@@ -139,9 +146,12 @@ IF(MSVC)
   ENDIF()
 
   #TODO: update the code and remove the disabled warnings
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996 /we4700 /we4311 /we4477 /we4302 /we4090 /wd4267 ")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /wd4291 /wd4577 /we4099 /we4700 /we4311 /we4477 /we4302 /we4090 /wd4267")
-
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4805 /wd4996 /we4700 /we4311 /we4477 /we4302 /we4090")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4805 /wd4291 /wd4996 /we4099 /we4700 /we4311 /we4477 /we4302 /we4090")
+  IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    # Temporarily disable size_t warnings, due to their amount
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")
+  ENDIF()
   IF(MYSQL_MAINTAINER_MODE MATCHES "ERR")
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")

include/my_valgrind.h

@@ -32,7 +32,7 @@
 # define MEM_CHECK_DEFINED(a,len) ((void) 0)
 #endif /* HAVE_VALGRIND_MEMCHECK_H */
 
-#ifndef DBUG_OFF
+#if !defined(DBUG_OFF) || defined(TRASH_FREED_MEMORY)
 #define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B); memset(A, C, trash_tmp); MEM_UNDEFINED(A, trash_tmp); } while (0)
 #else
 #define TRASH_FILL(A,B,C) do{ const size_t trash_tmp __attribute__((unused)) = (B) ; MEM_CHECK_ADDRESSABLE(A,trash_tmp);MEM_UNDEFINED(A,trash_tmp);} while (0)

libmariadb

@@ -13,7 +13,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-IF (NOT INSTALL_MYSQLTESTDIR)
+
+ IF (WIN32)
+  ADD_EXECUTABLE(my_safe_process safe_process_win.cc)
+  ADD_EXECUTABLE(my_safe_kill safe_kill_win.cc)
+  TARGET_LINK_LIBRARIES(my_safe_kill dbghelp psapi)
+ELSE()
+  ADD_EXECUTABLE(my_safe_process safe_process.cc)
+ENDIF()
+
+IF(NOT INSTALL_MYSQLTESTDIR)
   RETURN()
 ENDIF()
 
@@ -22,14 +31,9 @@ SET(INSTALL_ARGS
   COMPONENT Test
 )
 
+INSTALL(TARGETS my_safe_process ${INSTALL_ARGS})
 IF (WIN32)
-  MYSQL_ADD_EXECUTABLE(my_safe_process safe_process_win.cc ${INSTALL_ARGS})
-  MYSQL_ADD_EXECUTABLE(my_safe_kill safe_kill_win.cc ${INSTALL_ARGS})
-  TARGET_LINK_LIBRARIES(my_safe_kill dbghelp psapi)
-ELSE()
-  MYSQL_ADD_EXECUTABLE(my_safe_process safe_process.cc ${INSTALL_ARGS})
+  INSTALL(TARGETS my_safe_kill ${INSTALL_ARGS})
 ENDIF()
 
-INSTALL(FILES Base.pm
-  DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test
-)
+INSTALL(FILES Base.pm ${INSTALL_ARGS})

mysql-test/include/have_semisync_plugin.inc

@@ -8186,6 +8186,34 @@ END
 CALL p1();
 DROP PROCEDURE p1;
 #
+# MDEV-15057 Crash when using an unknown identifier as an SP parameter
+#
+CREATE OR REPLACE PROCEDURE p1 (a VARCHAR(10)) SELECT 1;
+CALL p1(a);
+ERROR 42S22: Unknown column 'a' in 'field list'
+drop procedure p1;
+CREATE OR REPLACE PROCEDURE p1 (a VARCHAR(10)) SELECT a|
+CREATE OR REPLACE PROCEDURE p2 ()
+BEGIN
+DECLARE name VARCHAR(10);
+SET name="hello";
+call p1(name);
+END|
+CREATE OR REPLACE PROCEDURE p3 ()
+BEGIN
+DECLARE name VARCHAR(10);
+SET name="hello";
+call p1(name2);
+END|
+call p2();
+a
+hello
+call p3();
+ERROR 42S22: Unknown column 'name2' in 'field list'
+drop procedure p1;
+drop procedure p2;
+drop procedure p3;
+#
 # Start of 10.3 tests
 #
 #