summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Merge 11.0 into 11.1Marko Mäkelä2023-03-173-24/+17
|\
| * 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.
* | | | | | | | MDEV-18931 Rename Mariabackup's xtrabackup_* files to mariadb_backup_*Alexander Barkov2023-03-107-60/+93
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming the default MariaDB backup directory from xtrabackup_backupfiles to mariadb_backup_files. Renaming files: - xtrabackup_binlog_info to mariadb_backup_binlog_info - xtrabackup_checkpoints to mariadb_backup_checkpoints - xtrabackup_galera_info to mariadb_backup_galera_info - xtrabackup_info to mariadb_backup_info - xtrabackup_slave_info to mariadb_backup_slave_info
* | | | | | | 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
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge branch '10.7' into 10.8Oleksandr Byelkin2023-01-314-13/+62
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '10.6' into 10.7Oleksandr Byelkin2023-01-314-13/+62
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2023-01-314-13/+62
| | | | | | |\ \ \ \ | | | | | | | | |/ / | | | | | | | |/| |
| | | | | | | * | | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-01-301-0/+0
| | | | | | | |\ \ \ | | | | | | | | | |/ | | | | | | | | |/|
| | | | | | | | * | Merge branch '10.3' into 10.4Oleksandr Byelkin2023-01-284-13/+62
| | | | | | | | |\ \
| | | | | | | * | \ \ Merge branch '10.4' into 10.5Oleksandr Byelkin2023-01-274-13/+62
| | | | | | | |\ \ \ \ | | | | | | | | |_|_|/ | | | | | | | |/| | |
| | | | | | | | * | | Merge branch '10.3' into 10.4Oleksandr Byelkin2023-01-264-13/+62
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | |/| / | | | | | | | | | |/
| | | | | | | | | * Minimize unsafe C functions usage - replace strcat() and strcpy() (and ↵Mikhail Chalov2023-01-203-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strncat() and strncpy()) with custom safe_strcat() and safe_strcpy() functions The MariaDB code base uses strcat() and strcpy() in several places. These are known to have memory safety issues and their usage is discouraged. Common security scanners like Flawfinder flags them. In MariaDB we should start using modern and safer variants on these functions. This is similar to memory issues fixes in 19af1890b56c6c147c296479bb6a4ad00fa59dbb and 9de9f105b5cb88249acc39af73d32af337d6fd5f but now replace use of strcat() and strcpy() with safer options strncat() and strncpy(). However, add '\0' forcefully to make sure the result string is correct since for these two functions it is not guaranteed what new string will be null-terminated. Example: size_t dest_len = sizeof(g->Message); strncpy(g->Message, "Null json tree", dest_len); strncat(g->Message, ":", sizeof(g->Message) - strlen(g->Message)); size_t wrote_sz = strlen(g->Message); size_t cur_len = wrote_sz >= dest_len ? dest_len - 1 : wrote_sz; g->Message[cur_len] = '\0'; 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 -- Reviewer and co-author Vicențiu Ciorbaru <vicentiu@mariadb.org> -- Reviewer additions: * The initial function implementation was flawed. Replaced with a simpler and also correct version. * Simplified code by making use of snprintf instead of chaining strcat. * Simplified code by removing dynamic string construction in the first place and using static strings if possible. See connect storage engine changes.
| | | | | | | | | * MDEV-23335 MariaBackup Incremental Does Not Reflect Dropped/Created DatabasesAlexander Barkov2023-01-191-1/+48
| | | | | | | | | |
| | | | | | | * | | MDEV-30423 Deadlock on Replica during BACKUP STAGE BLOCK_COMMIT on XA ↵Andrei2023-01-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions The user XA commit execution branch was caught not have been covered with MDEV-21953 fixes. The XA involved deadlock is resolved now to apply the former fixes pattern. Along the fixes the following changes have been implemented. - MDL lock attribute correction - dissociation of the externally completed XA from the current thread's xid_state in the error branches - cleanup_context() preseves the prepared XA - wait_for_prior_commit() is relocated to satisfy both the binlog ON (log-slave-updates and skip-log-bin) and OFF slave execution branches.
* | | | | | | | | | resolve-stack-dump was moved from server to client (RPM)Daniel Black2023-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like where the man page and Debian package put it.
* | | | | | | | | | cmake: rename backup component to BackupSergei Golubchik2023-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for consistency
* | | | | | | | | | MDEV-29582 post-review fixesSergei Golubchik2023-02-101-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't include my_progname in the error message, my_error starts from it automatically, resulting in, like /usr/bin/mysqladmin: Notice: /usr/bin/mysqladmin is deprecated and will be removed in a future release, use command 'mariadb-admin' and remove "Notice" so that the problem description would directly follow the executable name. make the check to work when the executable is in the PATH (so, invoked simply like 'mysql' and thus readlink cannot find it) fix the check in mysql_install_db and mysql_secure_installation to not print the warning if the intermediate path contains "mysql" substring add this message also to * mysql_waitpid * mysql_convert_table_format * mysql_find_rows * mysql_setpermissions * mysqlaccess * mysqld_multi * mysqld_safe * mysqldumpslow * mysqlhotcopy * mysql_ldb Closes #2273
* | | | | | | | | | Merge 10.11 into 11.0Marko Mäkelä2023-01-252-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch '10.10' into 10.11Oleksandr Byelkin2023-01-182-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '10.9' into 10.10Oleksandr Byelkin2023-01-182-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '10.8' into 10.9Oleksandr Byelkin2023-01-182-0/+2
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Merge branch '10.7' into 10.8Oleksandr Byelkin2023-01-182-0/+2
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Merge branch '10.6' into 10.7Oleksandr Byelkin2023-01-182-0/+2
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2023-01-182-0/+2
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-01-182-0/+2
| | | | | | | |\ \ \ | | | | | | | | |/ /
| | | | | | | | * | v5.5.4-stableOleksandr Byelkin2023-01-172-0/+2
| | | | | | | | | |
* | | | | | | | | | unify client/tool version stringSergei Golubchik2023-01-197-59/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it should now always be /path/to/exe Ver <tool version> Distrib <server version> for <OS> (<ARCH>) in all tools and clients