Merge branch '10.3' into 10.4

3 files changed, 62 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9695abeb33..f81ab458e6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -543,3 +543,40 @@ IF(NON_DISTRIBUTABLE_WARNING)
   MESSAGE(WARNING "
 You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.")
 ENDIF()
+
+IF(NOT WITHOUT_SERVER)
+  # Define target for minimal mtr-testable build
+  ADD_CUSTOM_TARGET(minbuild)
+  ADD_DEPENDENCIES(minbuild
+   aria_chk
+   aria_pack
+   mysql
+   mysqladmin
+   mysqlbinlog
+   mysqlcheck
+   mysql_client_test
+   mysqldump
+   mysqlimport
+   mysql_plugin
+   mysqlshow
+   mysqlslap
+   mysqltest
+   mysql_tzinfo_to_sql
+   mysql_upgrade
+   mysqld
+   my_print_defaults
+   my_safe_process
+   myisam_ftdump
+   myisamchk
+   myisamlog
+   myisampack
+   perror
+   replace)
+  IF(WIN32)
+    ADD_DEPENDENCIES(minbuild echo mysql_install_db my_safe_kill)
+  ENDIF()
+  ADD_CUSTOM_TARGET(smoketest
+    COMMAND perl ./mysql-test-run.pl main.1st
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mysql-test)
+  ADD_DEPENDENCIES(smoketest minbuild)
+ENDIF()
diff --git a/appveyor.yml b/appveyor.yml
index 4a6a49fd8b5..f5f1b57735a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,21 +1,30 @@
 version: build-{build}~branch-{branch}
 
-before_build:
-  - md %APPVEYOR_BUILD_FOLDER%\win_build
-  - cd %APPVEYOR_BUILD_FOLDER%\win_build
-  - cmake ..  -G "Visual Studio 15 2017 Win64" -DWITH_UNIT_TESTS=0 -DWITH_MARIABACKUP=0 -DMYSQL_MAINTAINER_MODE=ERR -DPLUGIN_ROCKSDB=NO -DPLUGIN_CONNECT=NO -DBISON_EXECUTABLE=C:\cygwin64\bin\bison
+clone_depth: 1
 
-build:
-  project: win_build\MySQL.sln
-  parallel: true
-  verbosity: minimal
-
-configuration: RelWithDebInfo
-platform: x64
+build_script:
+  # dump some system info
+  - echo  processor='%PROCESSOR_IDENTIFIER%' , processor count= %NUMBER_OF_PROCESSORS%
+  - cd %APPVEYOR_BUILD_FOLDER%
+  # Disable unneeded submodules for the faster build
+  - git config submodule.storage/columnstore/columnstore.update none
+  - git config submodule.storage/maria/libmarias3.update none
+  - git config submodule.storage/rocksdb/rocksdb.update none
+  - git config submodule.wsrep-lib.update none
+  # Build minimal configuration
+  - mkdir _build
+  - 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:\cygwin64\bin\bison -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
 
 test_script:
-  - set PATH=%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64
-  - cd %APPVEYOR_BUILD_FOLDER%\win_build\mysql-test
-  - perl mysql-test-run.pl --force --max-test-fail=10 --parallel=4 --testcase-timeout=10 --skip-test-list=unstable-tests --suite=main
+  - set PATH=C:\Strawberry\perl\bin;%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64
+  - cd %APPVEYOR_BUILD_FOLDER%\_build\mysql-test
+  - set /A parallel=4*%NUMBER_OF_PROCESSORS%
+  - perl mysql-test-run.pl --force --max-test-fail=10 --retry=2 -parallel=%parallel% --testcase-timeout=3 --suite=main  --skip-test-list=unstable-tests --mysqld=--loose-innodb-flush-log-at-trx-commit=2
 
-image: Visual Studio 2017
+image: Visual Studio 2019
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index af7b29b3c3b..ee6437502e1 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -80,7 +80,7 @@ int yylex(void *yylval, void *yythd);
 
 #define yyoverflow(A,B,C,D,E,F)               \
   {                                           \
-    size_t val= *(F);                          \
+    size_t val= *(F);                         \
     if (unlikely(my_yyoverflow((B), (D), &val))) \
     {                                         \
       yyerror(thd, (char*) (A));              \