summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* try harder to link unix_socket plugin staticallySergei Golubchik2019-02-211-3/+3
| | | | fix unix_socket tests to work if unix_socket is a built-in
* move aws_sdk to extra/Sergei Golubchik2019-02-211-2/+2
|
* Merge branch '10.3' into 10.4Oleksandr Byelkin2019-02-214-6/+13
|\
| * Merge branch '10.2' into bb-10.3-mergeOleksandr Byelkin2019-02-191-1/+1
| |\
| | * Merge branch '10.1' into 10.2Oleksandr Byelkin2019-02-191-1/+1
| | |\
| | | * Don't build aws_key_management plugin by defaultSergei Golubchik2019-02-191-1/+1
| | | |
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-02-193-6/+9
| |\ \ \ | | |/ /
| | * | typo cmake/submodules.cmakeLaurynas Biveinis2019-02-131-1/+1
| | | | | | | | | | | | Co-Authored-By: grooverdan <daniel@linux.ibm.com>
| | * | cmake/submodules: notify user about gitconfig for automatic updateDaniel Black2019-02-131-4/+8
| | | |
| | * | Merge 10.1 into 10.2Marko Mäkelä2019-02-032-6/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | Temporarily disable a test for commit 2175bfce3e9da8332f10ab0e0286dc93915533a2 because fixing it in 10.2 requires updating libmariadb.
| | | * Merge 10.1 into 10.1Marko Mäkelä2019-02-022-2/+9
| | | |\ | | | | | | | | | | | | | | | This is joint work with Oleksandr Byelkin.
| | | | * Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+0
| | | | |\
| | | | | * Crude "auto-load-data-local-infile" modemariadb-5.5.63Sergei Golubchik2019-01-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable LOAD DATA LOCAL INFILE suport by default and auto-enable it for the duration of one query, if the query string starts with the word "load". In all other cases the application should enable LOAD DATA LOCAL INFILE support explicitly.
| | | | * | Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+10
| | | | |\ \ | | | | | |/
| | | | | * MDEV-17615 cmake ssl error on musl/libresslSergei Golubchik2019-01-211-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't shortcut trying to test for openssl version, test what is actually needed for a code to compile
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2019-02-021-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.0-galera' into 10.1Oleksandr Byelkin2019-01-311-1/+1
| | | |\ \ \
| | | | * \ \ Merge remote-tracking branch 'origin/10.0' into 10.0-galeraJan Lindström2018-11-021-2/+3
| | | | |\ \ \
| | | | * \ \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-10-305-22/+18
| | | | |\ \ \ \
| | | | | * \ \ \ Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62Jan Lindström2018-10-294-21/+17
| | | | | |\ \ \ \
| | | | | * | | | | Bump WSREP_PATCH_VERSIONVasil Dimov2018-10-101-1/+1
| | | | | | | | | |
| | | | | * | | | | Bump wsrep patch version to 25.23Teemu Ollakka2018-02-251-1/+1
| | | | | | | | | |
| | | | | * | | | | Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-191-0/+1
| | | | | |\ \ \ \ \
| | | | | * | | | | | MW-406 Bumped up the wsrep patch version (5.5.57-25.22)Teemu Ollakka2017-10-191-1/+1
| | | | | | | | | | |
| | | | | * | | | | | MW-383 Bumped wsrep patch versionTeemu Ollakka2017-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Lindström <jan.lindstrom@mariadb.com>
| | | | | * | | | | | Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-202-4/+10
| | | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.56' into 5.5-galeraSachin Setiya2017-05-031-0/+3
| | | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-183-0/+32
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| | | | | * | | | | | | | | Bump WSREP_PATCH_VERSION to 20Sachin Setiya2017-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| | | | | * | | | | | | | | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-273-1/+3
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-251-0/+3
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-134-8/+17
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | Update WSREP_PATCH_REVNO.Nirbhay Choubey2016-02-101-1/+1
| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 14Philip Stoev2016-02-101-1/+1
| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Bump WSREP_PATCH_VERSION in cmake/wsrep.cmake to 13Philip Stoev2016-02-101-1/+1
| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-131-4/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.36' into 10.0-galeraJan Lindström2018-08-023-1/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Backport BUILD scripts from 10.4Monty2019-02-061-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes building with galera and tokudb - Added support for --without-wsrep BUILD script option
* | | | | | | | | | | | | | | | | | | | MDEV-18578 build aws sdk for all plugins to useVladislav Vaintroub2019-02-181-0/+91
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | cmake-wsrep: friendly error message about missing wsrep_api.hDaniel Black2019-02-132-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this commit the error message is: $ cmake . -DWITH_WSREP=ON -- Running cmake version 3.12.1 -- MariaDB 10.4.3 CMake Error at cmake/wsrep.cmake:36 (FILE): FILE STRINGS file ".../mariadb-server-10.4/wsrep-lib/wsrep-API/v26/wsrep_api.h" cannot be read. Call Stack (most recent call first): CMakeLists.txt:147 (INCLUDE) Having 'git config cmake.update-submodules yes' nicely updates the build without error. $ cmake . -DWITH_WSREP=ON -- Running cmake version 3.12.1 -- MariaDB 10.4.3 Submodule path 'wsrep-lib': checked out 'e7d72ae7f6a6995a21d743389426a963429a1fff' Submodule path 'wsrep-lib/wsrep-API/v26': checked out '75a5f452f2ba07b0f4a3a9a94825fccc71b27398'
* | | | | | | | | | | | | | | | | | | | MDEV-12484 Enable unix socket authentication by defaultSergei Golubchik2019-02-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default authentication for root@localhost to IDENTIFIED VIA mysql_native_password USING 'invalid' OR unix_socket which provides secure passwordless login, while still allowing SET PASSWORD to work as expected. Also create a second all-privilege account for the user that owns datadir (and thus has full access to the data anyway). Compile unix_socket plugin statically into the server.
* | | | | | | | | | | | | | | | | | | | cmake/wsrep: allow disabling -DWITH_WSREP=OFFDaniel Black2019-02-121-10/+10
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Galera4Brave Galera Crew2019-01-234-6/+25
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge 10.3 into 10.4Marko Mäkelä2019-01-063-9/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-01-033-9/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | fix RHEL8 "ambiguous python shebang" build failuresSergei Golubchik2019-01-031-0/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2mariadb-10.2.21Sergei Golubchik2018-12-301-5/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-12-291-5/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2018-12-201-5/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | / | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | |