revision-id: c4f97d3cfa46a7f1b283926dd7fedb648566283f (mariadb-10.0.37-65-gc4f97d3cfa4) parent(s): 8c2f3e0c16a4b9c2961a474f399b88be5ec330d1 eff71f39ddc117d09da5465f7ea9fe007ed89009 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-01-28 20:52:47 +0100 message: Merge branch '5.5' into 10.0 CMakeLists.txt | 10 +++++++-- client/mysqltest.cc | 2 -- cmake/build_configurations/mysql_release.cmake | 1 - config.h.cmake | 6 +++++- include/mysql.h | 2 +- include/mysql.h.pp | 2 +- mysql-test/disabled.def | 1 + mysql-test/r/mysql.result | 26 ++++++++++++++++++++++ mysql-test/t/mysql.test | 22 +++++++++++++++++++ mysys/my_file.c | 7 +++--- sql-common/client.c | 30 +++++++++++++++++++++++--- 11 files changed, 94 insertions(+), 15 deletions(-) diff --cc CMakeLists.txt index 3b270208a2d,bc4c4e4f103..92c1f9ef060 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -262,11 -254,17 +262,17 @@@ MY_CHECK_C_COMPILER_FLAG(-ggdb3 HAVE_GG IF(HAVE_GGDB3) SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb3") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3") -ENDIF() +ENDIF(HAVE_GGDB3) - OPTION(ENABLED_LOCAL_INFILE - "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN}) + SET(ENABLED_LOCAL_INFILE "AUTO" CACHE STRING "If we should should enable LOAD DATA LOCAL by default (OFF/ON/AUTO)") MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE) + IF (ENABLED_LOCAL_INFILE MATCHES "^(0|FALSE)$") + SET(ENABLED_LOCAL_INFILE OFF) + ELSEIF(ENABLED_LOCAL_INFILE MATCHES "^(1|TRUE)$") + SET(ENABLED_LOCAL_INFILE ON) + ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$") + MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO") + ENDIF() OPTION(WITH_FAST_MUTEXES "Compile with fast mutexes" OFF) MARK_AS_ADVANCED(WITH_FAST_MUTEXES) diff --cc mysql-test/disabled.def index 17bc921ab66,d4856f0b7aa..9292081b45e --- a/mysql-test/disabled.def +++ b/mysql-test/disabled.def @@@ -13,9 -13,6 +13,10 @@@ tablespace : disabled in events_time_zone : Test is not predictable as it depends on precise timing. read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836 +#show_explain : Psergey: random timeout in range-checked-for-each record query. +ssl_crl_clients_valid : broken upstream +ssl_crl : broken upstream +ssl_crl_clrpath : broken upstream file_contents : MDEV-6526 these files are not installed anymore lowercase_fs_on : lower_case_table_names=0 is not an error until 10.1 + partition_open_files_limit : open_files_limit check broken by MDEV-18360