summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | * Merge 10.3 into 10.4Marko Mäkelä2023-01-134-61/+228
| | | | | | |\
| | | | | | | * fix typoslilinjie2023-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: lilinjie <lilinjie@uniontech.com>
| | | | | | | * MDEV-30220: rsync SST completely ignores aria-log-dir-pathJulius Goryavsky2023-01-113-8/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for the --aria-log-dir-path option on the command line and for the aria-log-dir-path option in the configuration file to the SST scripts, since before this change these parameters were completely ignored during SST - SST scripts assumed that aria logs files are always located in the same directory as logs for innodb. Tests for this change will be added as a separate commit, along with tests for MDEV-30157 and MDEV-28669.
| | | | | | | * MDEV-30157: Galera SST doesn't properly handle undo* files from innodbJulius Goryavsky2023-01-111-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix adds separate handling for "undo*" files that contain undo logs as part of innodb files and adds a filter for undo* to the main filter used when initially transferring files with rsync.
| | | | | | | * pre-MDEV-30157 & pre-MDEV-28669: fixes before the main correctionsJulius Goryavsky2023-01-113-51/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds even more correct handling of parameters with paths when they contain leading or trailing spaces and/or slashes. Also it fixes problems that occur when the user specified explicit paths to additional directories, but these paths match the specified path of the data directory - in this case, additional subdirectories should be treated (in relation to the data directory) in the same way as if these paths were not specified or as if they are implicitly specified as "." or "./". But prior to this fix, existing code treated any values as if they were completely separate directories, whether or not they actually point to the same location to which datadir points to - and this sometimes resulted in incorrect file transfers. This fix does not contain separate tests, as tests will be part of the main commit(s). This fix has been made as a separate commit to facilitate review for major substantive fixes related to MDEV-30157 and MDEV-28669.
| | | | | | * | Merge branch '10.3' into 10.4Sergei Golubchik2023-01-101-1/+1
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * MDEV-30329: mariadb-service-convert resets systemd service to default User=rootAndrew Hutchings2023-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If mariadb-service-convert is run and the user variable is unset then this sets `User=` in `[Service]`, which then tries to run mariadb as root, which in-turn fails. This only happens when mysqld_safe is missing which is all the time now. So don't set `User=` if there is no user variable. Reviewer: Sergei Golubchik <serg@mariadb.org> (in PR #2382)
* | | | | | | | Merge 10.10 into 10.11Marko Mäkelä2023-01-113-3/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.9 into 10.10Marko Mäkelä2023-01-103-3/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2023-01-103-3/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MDEV-25004 test innodb_fts.versioning is omitted because ever since commit 685d958e38b825ad9829be311f26729cccf37c46 InnoDB would not allow writes to a database where the redo log file ib_logfile0 is missing.
| | | * | | | | Merge 10.6 into 10.7Marko Mäkelä2023-01-043-3/+5
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2023-01-033-3/+5
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.4 into 10.5Marko Mäkelä2023-01-031-1/+3
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-12-141-1/+3
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * MDEV-18591: mysql_install_db - pass --log-error to mysqld in install (#2363)Daniel Black2022-12-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we parsed it out in mysql_install_db for use in the error message, but failed to pass it to mysqld in the bootstrap. Also match log_error as it might appear in the .cnf files. Thanks Michal Schorm for the test case. Reviewed by: Faustin Lammler
| | | | | * | | MDEV-30275: mariadb names rather than mysql names should be usedDaniel Black2023-01-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mariadb-service-convert to use mariadbd-safe * galera_recovery to use mariadbd * mtr - wsrep use mariadb executables * debian/mariadb-server.mariadb.init use mariadbd-safe * debian/tests/smoke uses mariadb instead of mysql as client. Co-Author: Daniel Black <daniel@mariadb.org>
| | | | * | | | Merge branch 10.5 into 10.6Daniel Black2022-12-151-9/+9
| | | | |\ \ \ \ | | | | | |/ / /
* | | | | | | | Merge branch '10.10' into 10.11Daniel Black2022-12-151-9/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.9' into 10.10Daniel Black2022-12-151-9/+9
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge commit 10.7 into 10.8Daniel Black2022-12-151-9/+9
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch 10.6 into 10.7Daniel Black2022-12-151-9/+9
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '10.5' into 10.6Daniel Black2022-12-151-9/+9
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | | |/ / /
| | | | | * | | mariadb-install-db: use mariadb namesDaniel Black2022-12-141-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also refer to the service file for startup.
* | | | | | | | Merge 10.10 into 10.11Marko Mäkelä2022-12-141-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.9 into 10.10Marko Mäkelä2022-12-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-12-131-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-12-131-1/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-12-131-1/+1
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-12-131-1/+1
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-12-131-1/+1
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * MDEV-16735 Ensure mysql_upgrade works when changing alter_algorithmChristian Gonzalez2022-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-16735 describes how mysql_upgrade fails when alter_algorithm is set to a value different than 'DEFAULT'/'COPY'. It was marked as fixed by 0ee0868, but the fix didn't covered the possibility of having the global value of alter_algorithm set to something different than 'DEFAULT'/'COPY'. To ensure that the upgrade process works properly regardless the global value of alter_altorithm, this commit force it's value to 'DEFAULT' (note the quotes) for the mysql_upgrade session. All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc.
| | | | | | | * MDEV-28701 Update 10.3 HELP tablesIan Gilfillan2022-10-251-2039/+1285
| | | | | | | |
| | | | | | * | MDEV-28701 Update 10.4 HELP tablesIan Gilfillan2022-10-251-1189/+1247
| | | | | | | |
| | | | | | * | Update 10.4 HELP contentsIan Gilfillan2022-09-191-950/+1233
| | | | | | | |
| | | | | * | | MDEV-28701 Update 10.5 HELP tablesIan Gilfillan2022-10-251-1095/+1155
| | | | | | | |
* | | | | | | | Merge branch '10.10' into 10.11Oleksandr Byelkin2022-11-021-1100/+1165
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2022-11-011-1100/+1165
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-011-1100/+1165
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | MDEV-28701 Update 10.7 HELP tablesIan Gilfillan2022-10-251-623/+628
| | | | | | | |
| | | * | | | | Merge branch 10.6 into 10.7Daniel Black2022-10-251-1100/+1160
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | MDEV-28701 Update 10.6 HELP tablesIan Gilfillan2022-10-251-1100/+1160
| | | | | | | |
* | | | | | | | Add magic database access to test and test_% and removing the scriptOleksandr Byelkin2022-11-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from mysql-test-run.
* | | | | | | | MDEV-5215 prerequisite: remove test and test_* database hacks in the test suiteOleksandr Byelkin2022-11-011-8/+0
| | | | | | | |
* | | | | | | | Merge branch 'bb-10.10-release' into bb-10.11-releaseOleksandr Byelkin2022-10-172-10/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | MDEV-29776 collation_connection and db_collation are too short in mysql.proc ↵Alexander Barkov2022-10-132-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and mysql.event Increasing the data type from char(32) to char(64) for the following system columns: - mysql.event.collation_connection - mysql.event.db_collation - mysql.proc.collation_connection - mysql.proc.db_collation This change was forgotten during MDEV-27009. Also fixing the comment "Start/End of 10.9 tests" in ctype_utf8_uca.test to "Start/End of 10.10 tests", as MDEV-27009 was actually released in 10.10.
* | | | | | | | MDEV-6655: mysqld_multi default log location in wrong directory (#2285)Hartmut Holzgraefe2022-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mysqld_multi script template used @datadir@ as default log destination, this is not the MariaDB datadir in this context though but rather the -- typically write-only -- /share dir. The correct placeholder to use here is @localstatedir@ which gets replaced with the actual MariaDB datadir Co-authored-by: Hartmut Holzgraefe <hartmut@php.net>
* | | | | | | | MDEV-29625 Some clients/scripts refer to old slow log variablesSergei Golubchik2022-10-044-8/+8
|/ / / / / / /
* | | | | | | Merge 10.9 into 10.10Marko Mäkelä2022-09-211-824/+1142
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-09-211-824/+1142
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-09-211-824/+1142
| | |\ \ \ \ \ | | | |/ / / /
View Lorry Controller Status