Skip to content
Permalink
Browse files

Merge 10.2 into 10.3

  • Loading branch information...
dr-m committed Aug 21, 2019
2 parents e8de75d + 9de2e60 commit 32ec5fb979760ba2db52d8afc39e8e090cf80a9c
Showing with 1,384 additions and 336 deletions.
  1. +6 −1 CMakeLists.txt
  2. +2 −1 client/mysqltest.cc
  3. +4 −4 cmake/plugin.cmake
  4. +1 −1 libmariadb
  5. +2 −0 mysql-test/lib/My/SafeProcess/safe_process.cc
  6. +326 −0 mysql-test/main/join.result
  7. +59 −0 mysql-test/main/join.test
  8. +84 −20 mysql-test/main/mysql_tzinfo_to_sql_symlink.result
  9. +34 −0 mysql-test/main/selectivity.result
  10. +24 −0 mysql-test/main/selectivity.test
  11. +34 −0 mysql-test/main/selectivity_innodb.result
  12. +11 −0 mysql-test/main/type_datetime.result
  13. +14 −0 mysql-test/main/type_datetime.test
  14. +24 −0 mysql-test/main/type_int.result
  15. +21 −0 mysql-test/main/type_int.test
  16. +26 −0 mysql-test/suite/encryption/r/file_creation.result
  17. +1 −0 mysql-test/suite/encryption/t/file_creation.opt
  18. +41 −0 mysql-test/suite/encryption/t/file_creation.test
  19. +4 −38 mysql-test/suite/galera/r/galera_load_data.result
  20. +31 −11 mysql-test/suite/galera/t/galera_load_data.test
  21. +59 −0 mysql-test/suite/innodb/r/foreign-keys.result
  22. +2 −2 mysql-test/suite/innodb/r/innodb-fk-warnings.result
  23. +0 −1 mysql-test/suite/innodb/r/innodb_bug68148.result
  24. +9 −3 mysql-test/suite/innodb/r/innodb_bug84958.result
  25. +46 −0 mysql-test/suite/innodb/t/foreign-keys.test
  26. +0 −2 mysql-test/suite/innodb/t/innodb_bug68148.test
  27. +8 −1 mysql-test/suite/innodb/t/innodb_bug84958.test
  28. +3 −3 mysql-test/suite/innodb_gis/r/point_basic.result
  29. +66 −16 mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result
  30. +74 −0 mysql-test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink_skip.result
  31. +40 −0 mysql-test/suite/wsrep/t/mysql_tzinfo_to_sql_symlink_skip.test
  32. +1 −1 sql-common/my_time.c
  33. +75 −28 sql/sql_parse.cc
  34. +11 −8 sql/sql_select.cc
  35. +6 −1 sql/sql_statistics.cc
  36. +55 −9 sql/tztime.cc
  37. +3 −3 sql/wsrep_sst.cc
  38. +3 −1 storage/heap/hp_scan.c
  39. +1 −6 storage/innobase/btr/btr0scrub.cc
  40. +33 −77 storage/innobase/dict/dict0dict.cc
  41. +3 −18 storage/innobase/dict/dict0load.cc
  42. +27 −0 storage/innobase/fil/fil0crypt.cc
  43. +13 −7 storage/innobase/fil/fil0fil.cc
  44. +8 −28 storage/innobase/handler/ha_innodb.cc
  45. +20 −10 storage/innobase/include/dict0dict.h
  46. +4 −4 storage/innobase/include/dict0types.h
  47. +6 −0 storage/innobase/include/fil0crypt.h
  48. +52 −27 storage/innobase/row/row0ins.cc
  49. +4 −4 storage/innobase/row/row0mysql.cc
  50. +3 −0 storage/mroonga/ha_mroonga.cpp
@@ -1,5 +1,5 @@
# Copyright (c) 2006, 2017, Oracle and/or its affiliates.
# Copyright (c) 2008, 2018, MariaDB Corporation
# Copyright (c) 2008, 2019, MariaDB Corporation.
#
# 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
@@ -224,6 +224,11 @@ IF (WITH_UBSAN)
MY_CHECK_AND_SET_COMPILER_FLAG("-fsanitize=undefined -fno-sanitize=alignment -U_FORTIFY_SOURCE" DEBUG RELWITHDEBINFO)
ENDIF()

OPTION(WITH_MSAN "Enable memory sanitizer" OFF)
IF (WITH_MSAN)
MY_CHECK_AND_SET_COMPILER_FLAG("-fsanitize=memory -fsanitize-memory-track-origins -U_FORTIFY_SOURCE" DEBUG RELWITHDEBINFO)
ENDIF()

IF(NOT WITH_TSAN)
# enable security hardening features, like most distributions do
# in our benchmarks that costs about ~1% of performance, depending on the load
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
Copyright (c) 2009, 2017, MariaDB
Copyright (c) 2009, 2019, MariaDB
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
@@ -1694,6 +1694,7 @@ void abort_not_supported_test(const char *fmt, ...)
cur_file->file_name, cur_file->lineno);

char buff[DIE_BUFF_SIZE];
buff[0] = '\0';
print_file_stack(buff, buff + sizeof(buff));
fprintf(stderr, "%s", buff);

@@ -1,6 +1,6 @@
# Copyright (c) 2009, 2018, Oracle and/or its affiliates.
# Copyright (c) 2011, 2019, MariaDB Corporation
#
# Copyright (c) 2011, 2019, MariaDB Corporation.
#
# 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.
@@ -12,7 +12,7 @@
#
# 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-1335 USA
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA


INCLUDE(CMakeParseArguments)
@@ -209,7 +209,7 @@ MACRO(MYSQL_ADD_PLUGIN)
ELSEIF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
TARGET_LINK_LIBRARIES (${target} mysqld)
ENDIF()
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN)
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN AND NOT WITH_MSAN)
TARGET_LINK_LIBRARIES (${target} "-Wl,--no-undefined")
ENDIF()

@@ -1,4 +1,5 @@
/* Copyright (c) 2008, 2012, Oracle and/or its affiliates
Copyright (c) 2019, MariaDB Corporation.
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
@@ -219,6 +220,7 @@ int main(int argc, char* const argv[] )
sigemptyset(&sa.sa_mask);

sa_abort.sa_handler= handle_abort;
sa_abort.sa_flags= 0;
sigemptyset(&sa_abort.sa_mask);
/* Install signal handlers */
sigaction(SIGTERM, &sa,NULL);

0 comments on commit 32ec5fb

Please sign in to comment.
You can’t perform that action at this time.