Merge branch '10.7' into 10.8

MariaDB · Feb 4, 2022 · 4fb2cb1 · 4fb2cb1
2 parents c0f5fd2 + 9ed8deb
commit 4fb2cb1
Show file tree

Hide file tree

Showing 907 changed files with 20,188 additions and 6,217 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -30,7 +30,7 @@ pcre/testdata/greppatN4 -text
 *.c diff=cpp
 *.h diff=cpp
 *.cc diff=cpp
-*.ic  diff=cpp
+*.inl diff=cpp
 *.cpp diff=cpp
 *.java diff=cpp
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -419,6 +419,10 @@ IF(WITH_UNIT_TESTS)
  ENDIF()
 ENDIF()
 
+INCLUDE(cpack_tgz)
+INCLUDE(cpack_rpm)
+INCLUDE(cpack_deb)
+
 UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
 
 INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,15 +1,5 @@
-init:
- # Install bison
- - choco feature disable --name showDownloadProgress
- - choco install -y winflexbison
- - C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe --version
-
 version: build-{build}~branch-{branch}
 
-cache:
- - C:\ProgramData\chocolatey\bin -> appveyor.yml
- - C:\ProgramData\chocolatey\lib -> appveyor.yml
-
 clone_depth: 1
 
 build_script:
@@ -26,8 +16,8 @@ build_script:
  - cd _build
  - set BUILD_TYPE=MinSizeRel
  - set GENERATOR=-GNinja
- - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
- - cmake -E time cmake %GENERATOR% .. -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DMYSQL_MAINTAINER_MODE=ERR -DFAST_BUILD=1 -DBISON_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_FEEDBACK=NO
+ - call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
+ - cmake -E time cmake %GENERATOR% .. -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DMYSQL_MAINTAINER_MODE=ERR -DFAST_BUILD=1 -DBISON_EXECUTABLE=C:\cygwin64\bin\bison.exe -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_FEEDBACK=NO
  - set /A jobs=2*%NUMBER_OF_PROCESSORS%
  - cmake -E time cmake --build . -j %jobs% --config %BUILD_TYPE% --target minbuild
 
@@ -37,4 +27,4 @@ test_script:
  - set /A parallel=4*%NUMBER_OF_PROCESSORS%
  - perl mysql-test-run.pl --force --max-test-fail=10 --retry=2 -parallel=%parallel% --testcase-timeout=4 --suite=main --skip-test-list=%APPVEYOR_BUILD_FOLDER%\win\appveyor_skip_tests.txt --mysqld=--loose-innodb-flush-log-at-trx-commit=2
 
-image: Visual Studio 2019
+image: Visual Studio 2022
diff --git a/client/client_priv.h b/client/client_priv.h
@@ -101,6 +101,7 @@ enum options_client
  OPT_SSL_CRL, OPT_SSL_CRLPATH,
  OPT_IGNORE_DATA,
  OPT_PRINT_ROW_COUNT, OPT_PRINT_ROW_EVENT_POSITIONS,
+ OPT_CHECK_IF_UPGRADE_NEEDED,
  OPT_SHUTDOWN_WAIT_FOR_SLAVES,
  OPT_COPY_S3_TABLES,
  OPT_PRINT_TABLE_METADATA,