summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.11 into 11.0Marko Mäkelä2023-04-269-230/+385
|\
| * Merge 10.10 into 10.11Marko Mäkelä2023-04-269-230/+385
| |\
| | * Merge 10.9 into 10.10Marko Mäkelä2023-04-269-230/+385
| | |\
| | | * Merge 10.8 into 10.9Marko Mäkelä2023-04-269-230/+385
| | | |\
| | | | * Merge 10.6 into 10.8Marko Mäkelä2023-04-269-223/+376
| | | | |\
| | | | | * Merge 10.5 into 10.6Marko Mäkelä2023-04-259-223/+376
| | | | | |\
| | | | | | * Merge branch '10.4' into 10.5Oleksandr Byelkin2023-04-249-222/+375
| | | | | | |\
| | | | | | | * A cleanup for MDEV-30968 mariadb-backup does not copy Aria logs if ↵Alexander Barkov2023-04-241-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aria_log_dir_path is used Fixing buildbot failures on mariabackup.aria_log_dir_path_rel. The problem was that directory_exists() was called with the relative aria_log_dir_path value, while the current directory in mariadb-backup is not necessarily equal to datadir when MTR is running. Fix: - Moving building the absolute path un level upper: from the function copy_back_aria_logs() to the function copy_back(). - Passing the built absolute path to both directory_exists() and copy_back_aria_logs() as a parameter.
| | | | | | | * MDEV-30968 mariadb-backup does not copy Aria logs if aria_log_dir_path is usedAlexander Barkov2023-04-214-7/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `mariadb-backup --backup` was fixed to fetch the value of the @@aria_log_dir_path server variable and copy aria_log* files from @@aria_log_dir_path directory to the backup directory. Absolute and relative (to --datadir) paths are supported. Before this change aria_log* files were copied to the backup only if they were in the default location in @@datadir. - `mariadb-backup --copy-back` now understands a new my.cnf and command line parameter --aria-log-dir-path. `mariadb-backup --copy-back` in the main loop in copy_back() (when copying back from the backup directory to --datadir) was fixed to ignore all aria_log* files. A new function copy_back_aria_logs() was added. It consists of a separate loop copying back aria_log* files from the backup directory to the directory specified in --aria-log-dir-path. Absolute and relative (to --datadir) paths are supported. If --aria-log-dir-path is not specified, aria_log* files are copied to --datadir by default. - The function is_absolute_path() was fixed to understand MTR style paths on Windows with forward slashes, e.g. --aria-log-dir-path=D:/Buildbot/amd64-windows/build/mysql-test/var/...
| | | | | | | * MDEV-31039 mariadb-backup: remove global variables ds_data and ds_metaAlexander Barkov2023-04-129-221/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a non-functional change. simplifying the code logic: - removing global variables ds_data and ds_meta - passing these variables as parameters to functions instead - adding helper classes: Datasink_free_list and Backup_datasinks - moving some function accepting a ds_ctxt parameter as methods to ds_ctxt.
| | | | | | | * MDEV-25887 "Got notification message from PID xxxx, but reception only ↵Sergei Golubchik2023-04-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permitted for main PID yyyy" in systemd during SST server has systemd support and calls sd_notify() to communicate the status to systemd. mariabackup links the whole server in, but it should not notify systemd, because it's not started or managed by systemd.
| | | | * | | | Merge 10.6 into 10.8Marko Mäkelä2023-04-241-7/+9
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | MDEV-31080 fil_validate() failures during deferred tablespace recoveryMarko Mäkelä2023-04-191-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fil_space_t::create(), fil_space_t::add(): Expect the caller to acquire and release fil_system.mutex. In this way, creating a tablespace and adding the first (usually only) data file will be atomic. recv_sys_t::recover_deferred(): Correctly protect some changes by holding fil_system.mutex. Tested by: Matthias Leich
* | | | | | | | Merge 10.11 into 11.0Sergei Petrunia2023-04-173-11/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.10 into 10.11Marko Mäkelä2023-04-143-11/+39
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.9 into 10.10Marko Mäkelä2023-04-143-11/+39
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.8 into 10.9Marko Mäkelä2023-04-143-11/+39
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.6 into 10.8Marko Mäkelä2023-04-123-11/+39
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.5 into 10.6Marko Mäkelä2023-04-113-10/+34
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge remote-tracking branch '10.4' into 10.5Oleksandr Byelkin2023-03-313-10/+35
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * MDEV-29050 mariabackup issues error messages during InnoDB tablespaces ↵Vlad Lesin2023-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | export on partial backup preparing The solution is to suppress error messages for missing tablespaces if mariabackup is launched with "--prepare --export" options. "mariabackup --prepare --export" invokes itself with --mysqld parameter. If the parameter is set, then it starts server to feed "FLUSH TABLES ... FOR EXPORT;" queries for exported tablespaces. This is "normal" server start, that's why new srv_operation value is introduced. Reviewed by Marko Makela.
| | | | | | | * MDEV-28187 mariadb-backup doesn't utilise innodb-undo-log-directory (if ↵Vlad Lesin2023-03-211-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specified as a relative path) during copy-back operation Make absolute destination path from relative one, basing on mysql data directory. Reviewed by Alexander Barkov.
| | | | | | | * MDEV-30758 mariabackup --help only lists server groups read in configurationkevincheng22023-03-071-1/+11
| | | | | | | |
| | | | | | | * MDEV-24005 Updated the --use-memory option usage message in Mariabackup help ↵Debjyoti2023-03-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command
| | | | | | | * Fix few vulnerabilities found by CppcheckHugo Wen2023-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While performing SAST scanning using Cppcheck against source code of commit 81196469, several code vulnerabilities were found. Fix following issues: 1. Parameters of `snprintf` function are incorrect. Cppcheck error: client/mysql_plugin.c:1228: error: snprintf format string requires 6 parameters but only 5 are given. It is due to commit 630d7229 introduced option `--lc-messages-dir` in the bootstrap command. However the parameter was not even given in the `snprintf` after changing the format string. Fix: Restructure the code logic and correct the function parameters for `snprintf`. 2. Null pointer is used in a `snprintf` which could cause a crash. Cppcheck error: extra/mariabackup/xbcloud.cc:2534: error: Null pointer dereference The code intended to print the swift_project name, if the opt_swift_project_id is NULL but opt_swift_project is not NULL. However the parameter of `snprintf` was mistakenly using `opt_swift_project_id`. Fix: Change to use the correct string from `opt_swift_project`. 3. Potential double release of a memory Cppcheck error: plugin/auth_pam/testing/pam_mariadb_mtr.c:69: error: Memory pointed to by 'resp' is freed twice. A pointer `resp` is reused and allocated new memory after it has been freed. However, `resp` was not set to NULL after freed. Potential double release of the same pointer if the call back function doesn't allocate new memory for `resp` pointer. Fix: Set the `resp` pointer to NULL after the first free() to make sure the same address is not freed twice. 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.
* | | | | | | | Merge 10.11 into 11.0Marko Mäkelä2023-03-173-24/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.10 into 10.11Marko Mäkelä2023-03-171-3/+13
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.9 into 10.10Marko Mäkelä2023-03-171-3/+13
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.8 into 10.9Marko Mäkelä2023-03-171-3/+13
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge 10.6 into 10.8Marko Mäkelä2023-03-161-3/+13
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.5 into 10.6Marko Mäkelä2023-03-161-2/+5
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | MDEV-30775 Performance regression in fil_space_t::try_to_close() introduced ↵Vlad Lesin2023-03-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in MDEV-23855 fil_node_open_file_low() tries to close files from the top of fil_system.space_list if the number of opened files is exceeded. It invokes fil_space_t::try_to_close(), which iterates the list searching for the first opened space. Then it just closes the space, leaving it in the same position in fil_system.space_list. On heavy files opening, like during 'SHOW TABLE STATUS ...' execution, if the number of opened files limit is reached, fil_space_t::try_to_close() iterates more and more closed spaces before reaching any opened space for each fil_node_open_file_low() call. What causes performance regression if the number of spaces is big enough. The fix is to keep opened spaces at the top of fil_system.space_list, and move closed files at the end of the list. For this purpose fil_space_t::space_list_last_opened pointer is introduced. It points to the last inserted opened space in fil_space_t::space_list. When space is opened, it's inserted to the position just after the pointer points to in fil_space_t::space_list to preserve the logic, inroduced in MDEV-23855. Any closed space is added to the end of fil_space_t::space_list. As opened spaces are located at the top of fil_space_t::space_list, fil_space_t::try_to_close() finds opened space faster. There can be the case when opened and closed spaces are mixed in fil_space_t::space_list if fil_system.freeze_space_list was set during fil_node_open_file_low() execution. But this should not cause any error, as fil_space_t::try_to_close() still iterates spaces in the list. There is no need in any test case for the fix, as it does not change any functionality, but just fixes performance regression.
| * | | | | | | Fixes to mysql_install_dbMonty2023-03-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change to use 'mariadbd' instead of 'mysqld' in help texts and other visible places. - Start binary 'mariadbd' instead of 'mysqld'. This will remove a warning in 11.0 when running mysql_install_db. - Use my_print_defaults --mariadbd instead of --mysqld - Use --skip-log-error if the user don't have access to log-error file. This it needed to allow mysql_install_db to work silenty for users that has not write access to /var/log. Other things: - Updated my_print_defaults to support --mariadbd
| * | | | | | | MDEV-30810 errmsg-utf8.txt no longer uses charsetsDaniel Black2023-03-101-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Charset names in the 'languages' line are not used any more. Removing to avoid confusion. All messages in errmsg-utf8.txt are in utf8 now. Charset names should have been removed in MySQL-5.5 during: https://dev.mysql.com/worklog/task/?id=751 Bump version number.
* | | | | | | | Merge 10.11 into 11.0Marko Mäkelä2023-02-166-23/+77
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 10.10 into 10.11Marko Mäkelä2023-02-163-10/+26
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.9 into 10.10Marko Mäkelä2023-02-163-10/+27
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge 10.8 into 10.9Marko Mäkelä2023-02-163-10/+27
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | MDEV-27774 fixup: Correct a commentMarko Mäkelä2023-02-161-1/+1
| | | | | | | |
| | | | * | | | Merge 10.6 into 10.8Marko Mäkelä2023-02-103-9/+26
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge 10.5 into 10.6Marko Mäkelä2023-02-103-9/+27
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge 10.4 into 10.5Marko Mäkelä2023-02-102-0/+14
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * Add more workaround atop existing WolfSSL 5.5.4 workaround to compile ASAN ↵Vladislav Vaintroub2023-02-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on buildbot The -D flag was not passed to asm compiler, despite SET_PROPERTY(COMPILE_OPTIONS) The exact reason for that remains unknown. It was not seen with gcc, as nor was be reproduced on newer CMake.
| | | | | | | * MDEV-30492 Crash when use mariabackup.exe with config ↵Daniel Black2023-02-071-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'innodb_flush_method=async_unbuffered' Normalize innodb_flush_method, the same as the service, before attempting to print it.
| | | | | | * | Merge mariadb-10.5.19 into 10.5Marko Mäkelä2023-02-065-13/+62
| | | | | | |\ \
| | | | | | * | | MDEV-25765 Mariabackup reduced verbosity option for log outputAlexander Barkov2023-01-311-1/+3
| | | | | | | | |
| | | | | | * | | MDEV-29244 mariabackup --help output still referst to innobackupexAlexander Barkov2023-01-312-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the tool name in the "mariadb-backup --help" output from "innobackupex" to "mariadb-backup".
| * | | | | | | | Merge branch '10.10' into 10.11Oleksandr Byelkin2023-01-314-13/+62
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2023-01-314-13/+62
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2023-01-314-13/+62
| | | |\ \ \ \ \ \ | | | | |/ / / / /