mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.3 into 10.4

Browse source
This commit is contained in:
Marko Mäkelä 2021-07-02 14:55:52 +03:00
commit 372ea88264
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/submodules.cmake
View file

@ -28,7 +28,7 @@ IF(GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
RESULT_VARIABLE update_result) RESULT_VARIABLE update_result)
ELSE() ELSE()
MESSAGE(STATUS "Updating submodules") MESSAGE(STATUS "Updating submodules")
EXECUTE_PROCESS(COMMAND "${GIT_EXECUTABLE}" submodule update --init --recursive EXECUTE_PROCESS(COMMAND "${GIT_EXECUTABLE}" submodule update --init --recursive --depth=1
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
RESULT_VARIABLE update_result) RESULT_VARIABLE update_result)
ENDIF() ENDIF()

8
mysql-test/suite/funcs_1/r/is_tables_is_embedded.result
View file

@ -458,6 +458,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL CHECKSUM NULL
CREATE_OPTIONS #CO# CREATE_OPTIONS #CO#
TABLE_COMMENT #TC# TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY Y
user_comment user_comment
Separator ----------------------------------------------------- Separator -----------------------------------------------------
TABLE_CATALOG def TABLE_CATALOG def
@ -831,6 +833,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL CHECKSUM NULL
CREATE_OPTIONS #CO# CREATE_OPTIONS #CO#
TABLE_COMMENT #TC# TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY Y
user_comment user_comment
Separator ----------------------------------------------------- Separator -----------------------------------------------------
TABLE_CATALOG def TABLE_CATALOG def
@ -1570,6 +1574,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL CHECKSUM NULL
CREATE_OPTIONS #CO# CREATE_OPTIONS #CO#
TABLE_COMMENT #TC# TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY Y
user_comment user_comment
Separator ----------------------------------------------------- Separator -----------------------------------------------------
TABLE_CATALOG def TABLE_CATALOG def
@ -1943,6 +1949,8 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL CHECKSUM NULL
CREATE_OPTIONS #CO# CREATE_OPTIONS #CO#
TABLE_COMMENT #TC# TABLE_COMMENT #TC#
MAX_INDEX_LENGTH #MIL#
TEMPORARY Y
user_comment user_comment
Separator ----------------------------------------------------- Separator -----------------------------------------------------
TABLE_CATALOG def TABLE_CATALOG def