summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-30205 Move /usr/share/mysql to /usr/share/mariadbDaniel Black2023-04-119-30/+30
| | | | | | | | | These are mainly internal files so is a low impact change. The few scripts/mysql*sql where renames to mariadb_* prefix on the name. mysql-test renamed to mariadb-test in the final packages
* Merge 11.0 into 11.1Marko Mäkelä2023-03-2943-133/+135
|\
| * MDEV-19629 post-merge fixesbb-11.0-sergSergei Golubchik2023-03-2743-133/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * it isn't "pfs" function, don't call it Item_func_pfs, don't use item_pfsfunc.* * tests don't depend on performance schema, put in the main suite * inherit from Item_str_ascii_func * use connection collation, not utf8mb3_general_ci * set result length in fix_length_and_dec * do not set maybe_null * use my_snprintf() where possible * don't set m_value.ptr on every invocation * update sys schema to use the format_pico_time() * len must be size_t (compilation error on Windows) * the correct function name for double->double is fabs() * drop volatile hack
* | Merge 11.0 into 11.1Marko Mäkelä2023-03-271-1/+1
|\ \ | |/
| * MDEV-30778: Remove Awk from mysql_install_dbTuukka Pasanen2023-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | Commit reduces need of AWK-command at least for Debian mariadb-server-compat package. Commit removes need of AWK-command from scripts/mysql_install_db.sh script. AWK command is replace by purely Posix sh compiliant version.
* | Merge 11.0 into 11.1Marko Mäkelä2023-03-201-5/+12
|\ \ | |/
| * Merge 10.11 into 11.0Marko Mäkelä2023-03-201-5/+12
| |\
| | * Fixed newly introduced bug in scripts/mysql_install_dbMonty2023-03-191-5/+12
| | | | | | | | | | | | | | | | | | In some cases, the errors would not be written to the log. This was however not critical as in most cases mysql_install_db should not normally write anything to the log.
* | | Merge 11.0 into 11.1Marko Mäkelä2023-03-171-6/+18
|\ \ \ | |/ /
| * | Merge 10.11 into 11.0Marko Mäkelä2023-03-171-6/+18
| |\ \ | | |/
| | * Fixes to mysql_install_dbMonty2023-03-101-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| | * Update 10.11 HELPIan Gilfillan2023-02-141-13/+13
| | |
* | | MDEV-18931 Rename Mariabackup's xtrabackup_* files to mariadb_backup_*Alexander Barkov2023-03-101-8/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix warning in mariadb-install-dbAndrew Hutchings2023-03-061-14/+14
| | | | | | | | | | | | | | If you are running mariadb-install-db from a source tree instead of installation it was executing `mysqld` instead of `mariadb` which showed the deprecation warning. This patch fixes that as well as fixing messages and links to other things that have been renamed.
* | Fixes to make dbug traces from Windows easier to compare with Unix tracesMonty2023-03-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove DBUG calls from my_winfile.c where call and parameters are already printed by mysys. - Remove DBUG from my_get_osfhandle() and my_get_open_flags() to remove DBUG noise. - Updated convert-debug-for-diff to take into account windows. - Changed some DBUG_RETURN(function()) to tmp=function(); DBUG_RETURN(tmp); This is needed as Visual C++ prints for DBUG binaries a trace for func_a() { DBUG_ENTER("func_a"); DBUG_RETURN(func_b()) } as >func_a <func_a >func_b <func_b instead of when using gcc: >func_a | >func_b | <func_b <func_a
* | Merge 11.0-selectivity into 11.0Sergei Petrunia2023-02-153-3/+90
|\ \
| * | Added sys.optimizer_switch_on() and sys.optimizer_switch_off()Monty2023-02-102-0/+70
| | | | | | | | | | | | | | | These are helpful tools to quickly see what optimizer switch options are on or off. The different options are displayed alphabetically
| * | Updated convert-debug-for-diffMonty2023-01-301-3/+20
| | |
* | | Update 11.0 HELPIan Gilfillan2023-02-131-13/+13
| | |
* | | MDEV-30203 Move mysql symlinks to different packageDaniel Black2023-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For both Deb and RPM, create mariadb-client-compat and mariadb-server-compat containing the mysql links to the mariadb named executables/scripts. The mariadb-client-core mysqlcheck was moved to mariadb-client-compat. The symlinks in MYSQL_ADD_EXECUTABLE is tagged as a {Client,Server}Symlinks component and placed in the symlinks packages. Man pages are restructured be installed into compat package if that matches the executable. Columnstore has a workaround as it doesn't use the cmake/plugin.cmake. Scripts likewise have compatibility symlinks are in the {server,client}-compat packages. Co-author: Andrew Hutchings <andrew@linuxjedi.co.uk> Closes #2390
* | | MDEV-29582 post-review fixesSergei Golubchik2023-02-1010-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | MDEV-29582 deprecate mysql* namesDaniel Black2023-02-102-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eventually mysql symlinks will go away, as MariaDB and MySQL keep diverging and we do not want to make it impossible to install MariaDB and MySQL side-by-side when users want it. It also useful if people start using MariaDB tools with MariaDB. If the exe doesn't begine with "mariadb" or is a symlink, print a warning to use the resolved name. In my_readlink, add check on my_thread_var as its used by comp_err and other build utils that also use my_init.
* | | MDEV-30448 No deprecation message shown for mysql_fix_extensionsDaniel Black2023-02-071-0/+2
| | |
* | | MDEV-30498 Rename mysql_upgrade state file to mariadb_upgradeChristian Gonzalez2023-02-071-1/+1
|/ / | | | | | | | | | | | | | | | | | | Renames the upgrade state file, and ensures the old file is properly removed when `mariadb-upgrade` tool is executed. 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-01-251-954/+958
|\ \ | |/
| * Merge 10.10 into 10.11Marko Mäkelä2023-01-241-954/+958
| |\
| | * Update 10.10 HELP tablesIan Gilfillan2023-01-241-954/+958
| | |
* | | MDEV-30153 ad hoc client versions are confusingSergei Golubchik2023-01-191-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | try to make them less confusing for users. Hopefully, if the version string will be changed like - mariadb Ver 15.1 Distrib 10.11.2-MariaDB for Linux (x86_64) + mariadb from 10.11.2-MariaDB, client 15.1 for Linux (x86_64) users will be less inclined to reply "15.1" to the question "what mariadb version are you using?"
* | Merge 10.10 into 10.11Marko Mäkelä2023-01-135-62/+229
|\ \ | |/
| * Merge 10.9 into 10.10Marko Mäkelä2023-01-135-62/+229
| |\
| | * Merge 10.7 into 10.8Marko Mäkelä2023-01-135-62/+229
| | |\
| | | * Merge 10.6 into 10.7Marko Mäkelä2023-01-135-62/+229
| | | |\
| | | | * Merge 10.5 into 10.6Marko Mäkelä2023-01-135-62/+229
| | | | |\
| | | | | * Merge 10.4 into 10.5Marko Mäkelä2023-01-135-62/+229
| | | | | |\
| | | | | | * 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>
View Lorry Controller Status