summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Oleksandr Byelkin2020-01-241-2/+2
|\
| * MDEV-17601: MariaDB Galera does not expect 'mbstream' as streamfmtJulius Goryavsky2020-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | Setting "streamfmt=mbstream" in the "[sst]" section causes SST to fail because the format automatically switches to 'tar' by default (insead of mbstream). To fix this, we need to add mbstream to the list of valid values for the format, making it synonymous with xbstream. This must be done both in the SST script and when parsing the options of the corresponding utilities.
* | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-12-031-1/+1
|\ \ | |/
| * Merge branch '5.5' into 10.1Oleksandr Byelkin2019-12-031-1/+1
| |\
| | * Using `variables` instead of `values` in mysqld --help documentation would ↵Anel Husakovic2019-12-021-1/+1
| | | | | | | | | | | | be more accurate
* | | manual merge 10.1->10.2Andrei Elkin2019-11-111-0/+7
|\ \ \ | |/ /
| * | MDEV-20981 wsrep_sst_mariabackup fails silently when mariabackup is not ↵Hartmut Holzgraefe2019-11-081-0/+7
| | | | | | | | | | | | | | | | | | installed (#1406) Make sure failure to find mariabackup binary does not terminate the script silently, terminate with a clear error message instead
* | | Merge 10.1 into 10.2Marko Mäkelä2019-10-251-1/+1
|\ \ \ | |/ /
| * | Merge branch 'github/5.5' into 10.1Sergei Golubchik2019-10-231-1/+1
| |\ \ | | |/
| | * MDEV-9546 mysqlaccess script shows an old version (which was vulnerable to ↵Sergei Golubchik2019-10-191-1/+1
| | | | | | | | | | | | | | | | | | CVE-2005-0004) update mysqlaccess version
| * | MDEV-20728: /usr/sbin/mysqld: unknown variable 'defaults-group-suffix=mysqld1Julius Goryavsky2019-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the mysqld_multi script passes the --defaults-group-suffix option to mysqld, it must remove the initial substring with the group name ("mysqld") from option value, because otherwise substring "mysqld" will be added to the group name and then the group name will contain the word "mysqld" twice, which is wrong, because mysqld itself adds the suffix received to the group name.
| * | MDEV-20614: Syntax error, and option put in wrong placeJulius Goryavsky2019-09-261-2/+3
| | | | | | | | | | | | | | | | | | A syntax error in the mysqld_multi.sh script has been fixed here + a "--defaults-group-suffix" option has been moved to the top of the mysqld options list.
* | | MDEV-20728: /usr/sbin/mysqld: unknown variable 'defaults-group-suffix=mysqld1Julius Goryavsky2019-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the mysqld_multi script passes the --defaults-group-suffix option to mysqld, it must remove the initial substring with the group name ("mysqld") from option value, because otherwise substring "mysqld" will be added to the group name and then the group name will contain the word "mysqld" twice, which is wrong, because mysqld itself adds the suffix received to the group name.
* | | MDEV-20614: Syntax error, and option put in wrong placeJulius Goryavsky2019-09-271-2/+3
| | | | | | | | | | | | | | | | | | A syntax error in the mysqld_multi.sh script has been fixed here + a "--defaults-group-suffix" option has been moved to the top of the mysqld options list.
* | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2019-09-241-1/+4
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.5' into 10.1Alexander Barkov2019-09-241-1/+4
| |\ \ | | |/
| | * Update mysqld_safe.sh - introduce defaults-group-suffix handlingrantal2019-09-211-1/+4
| | | | | | | | | | | | "--defaults-group-suffix" must be be given as the first argument on the command-line of mysqld
* | | Merge 10.1 into 10.2Marko Mäkelä2019-09-231-1/+7
|\ \ \ | |/ /
| * | MDEV-19211 Fix mysqld_safe --dry-runVicențiu Ciorbaru2019-09-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld_safe --dry-run needs to either call exit or return, depending if it is being sourced or not, otherise return can lead to the error: return: can only `return' from a function or sourced script The original fix suggestion was proposed by FaramosCZ <mschorm@centrum.cz>
* | | MDEV-19679 - CREATE SERVER needs tweaks for compatibility with CONNECT engineAnel Husakovic2019-09-201-1/+1
| | |
* | | Updated mtr files to support different compiled in optionsMonty2019-09-012-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows one to run the test suite even if any of the following options are changed: - character-set-server - collation-server - join-cache-level - log-basename - max-allowed-packet - optimizer-switch - query-cache-size and query-cache-type - skip-name-resolve - table-definition-cache - table-open-cache - Some innodb options etc Changes: - Don't print out the value of system variables as one can't depend on them to being constants. - Don't set global variables to 'default' as the default may not be the same as the test was started with if there was an additional option file. Instead save original value and reset it at end of test. - Test that depends on the latin1 character set should include default_charset.inc or set the character set to latin1 - Test that depends on the original optimizer switch, should include default_optimizer_switch.inc - Test that depends on the value of a specific system variable should set it in the test (like optimizer_use_condition_selectivity) - Split subselect3.test into subselect3.test and subselect3.inc to make it easier to set and reset system variables. - Added .opt files for test that required specfic options that could be changed by external configuration files. - Fixed result files in rockdsb & tokudb that had not been updated for a while.
* | | Merge 10.1 into 10.2Marko Mäkelä2019-08-284-34/+71
|\ \ \ | |/ /
| * | Improved handling of subdirectories in the xtrabackup-v2 SST scripts ↵Julius Goryavsky2019-08-282-8/+35
| | | | | | | | | | | | (similar to MDEV-18863) for more predictable test results (related to xtrabackup-v2 SST)
| * | MDEV-20420: SST failed after MDEV-18863 in some test configurationsJulius Goryavsky2019-08-265-34/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After applying MDEV-18863, in some test configurations, SST may fails due to duplication of some parameters (in particular "--port") in the main part of the command line and after "--mysqld-args", as well as due to incorrect interpretation of the parameter "--port" passed after "--mysqld-args" when the SST script is invoked without explicitly specifying a port for SST. In addition, it is necessary to correctly handle spaces, quotation marks and special characters when copying original arguments from the argv[] array to a new command line (after "--mysqld-args"). This patch resolves these shortcomings.
| * | Bash-specific operator replaced by a universal oneJulius Goryavsky2019-08-211-1/+1
| | |
| * | MDEV-18863: Galera SST scripts can't read [mysqldN] option groupsJulius Goryavsky2019-08-194-7/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some users and some scripts (for example, mysqld_multi.sh) use special option groups with names like [mysqld1], [mysqld2], ..., [mysqldN]. But SST scripts can't currently fully support these option groups. The only option group-related value it gets from the server is --defaults-group-suffix, if that option was set for mysqld when the server was started. However, the SST scripts does not get told by the server to read these option groups, so this means that the SST script will fail to read options like innodb-data-home-dir when it is in a option group like [mysqld1]...[mysqldN]. Moreover, SST scripts ignore many parameters that can be passed to them explicitly and cannot transfer them further, for example, to the input of mariabackup utility. Ideally, we want to transfer all the parameters of the original mysqld call to utilities such as mariabackup, however the SST script does not receive these parameters from the server and therefore cannot transfer them to mariabackup. To correct these shortcomings, we need to transfer to the scripts all of the parameters of the original mysqld call, and in the SST scripts themselves provide for the transfer all of these parameters to utilities such as mariabackup. To prevent these parameters from mixing with the script's own parameters, they should be transferred to SST script after the special option "--mysqld-args", followed by the string argument with the original parameters, as it received by the mysqld call at the time of launch (further all these parameters will be passed to mariabackup, for example). In addition, the SST scripts themselves must be refined so that they can read the parameters from the user-selected group, not just from the global mysqld configuration group. And also so that they can receive the parameters (which important for their work) as command-line arguments.
* | | After-merge fixesMarko Mäkelä2019-08-201-1/+1
| | | | | | | | | | | | | | | | | | main.selectivity_innodb: Re-record the result. MDEV-18863: Make wsrep_sst_mariabackup use Bash due to the += syntax.
* | | MDEV-18863: Galera SST scripts can't read [mysqldN] option groupsJulius Goryavsky2019-08-194-7/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some users and some scripts (for example, mysqld_multi.sh) use special option groups with names like [mysqld1], [mysqld2], ..., [mysqldN]. But SST scripts can't currently fully support these option groups. The only option group-related value it gets from the server is --defaults-group-suffix, if that option was set for mysqld when the server was started. However, the SST scripts does not get told by the server to read these option groups, so this means that the SST script will fail to read options like innodb-data-home-dir when it is in a option group like [mysqld1]...[mysqldN]. Moreover, SST scripts ignore many parameters that can be passed to them explicitly and cannot transfer them further, for example, to the input of mariabackup utility. Ideally, we want to transfer all the parameters of the original mysqld call to utilities such as mariabackup, however the SST script does not receive these parameters from the server and therefore cannot transfer them to mariabackup. To correct these shortcomings, we need to transfer to the scripts all of the parameters of the original mysqld call, and in the SST scripts themselves provide for the transfer all of these parameters to utilities such as mariabackup. To prevent these parameters from mixing with the script's own parameters, they should be transferred to SST script after the special option "--mysqld-args", followed by the string argument with the original parameters, as it received by the mysqld call at the time of launch (further all these parameters will be passed to mariabackup, for example). In addition, the SST scripts themselves must be refined so that they can read the parameters from the user-selected group, not just from the global mysqld configuration group. And also so that they can receive the parameters (which important for their work) as command-line arguments.
* | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-07-261-1/+8
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-251-1/+8
| |\ \ | | |/
| | * Extra comment to mysql_install_dbVicențiu Ciorbaru2019-07-011-0/+2
| | | | | | | | | | | | | | | Explain why it makes sense to not consider builddir == srcdir directly, for cases when we do out-of-source builds.
| | * mysql_install_db: assume builddir is dirname0Daniel Black2019-07-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assumption in the original commit for --builddir (648d3cedbc09), was to assume that without a --builddir, and when --srcdir is specified, that the builddir is the same as the srcdir. The problem is that this assumption does not hold for out-of-source builds and we can figure out the builddir by looking for where mysql_install_db script is. As mysql_install_db is in the builddir, we use dirname0 as the builddir after checking that my_print_defaults is also located from dirname0, otherwise default to old behavior.
* | | Merge 10.1 into 10.2Eugene Kosov2019-07-091-2/+2
|\ \ \ | |/ /
| * | MDEV-19726 MariaDB server or backup RPM install assumes mysql user existsSergei Golubchik2019-07-041-1/+1
| | | | | | | | | | | | mysqld_safe shouldn't try to mkdir or chown if --dry-run
| * | fix incorrect shell usageSergei Golubchik2019-07-041-1/+1
| | |
* | | Merge 10.1 into 10.2Marko Mäkelä2019-05-1332-32/+32
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-1134-34/+34
| |\ \ | | |/
| | * Update FSF AddressVicențiu Ciorbaru2019-05-1126-26/+26
| | | | | | | | | | | | * Update wrong zip-code
* | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-05-042-5/+7
|\ \ \ | |/ /
| * | MDEV-17640 UMASK_DIR configuration for mysql_install_db is not applied to ↵Sergei Golubchik2019-04-241-3/+5
| | | | | | | | | | | | | | | | | | mysql database create mysql and test databases with SQL, not mkdir.
| * | use the correct SQL SECURITY type for OpenGIS stored proceduresSergei Golubchik2019-04-241-2/+2
| | |
* | | Merge branch '10.1' into 10.2Sergei Golubchik2019-03-151-3/+6
|\ \ \ | |/ /
| * | MDEV-18934: Document missing mysqldumpslow sort optionsIan Gilfillan2019-03-151-3/+6
| | |
* | | Merge 10.1 into 10.2Marko Mäkelä2019-03-114-39/+43
|\ \ \ | |/ /
| * | remove WSREP_SST_OPT_SUFFIX_VALUE, checking [mysqld] is covered in the ↵Jan Lindström2019-03-091-3/+0
| | | | | | | | | | | | parse_cnf --mysqld case also in wsrep_sst_xtrabackup-v2
| * | wsrep_sst: remove WSREP_SST_OPT_SUFFIX_VALUE, checking [mysqld] is covered ↵Daniel Black2019-03-093-10/+2
| | | | | | | | | | | | in the parse_cnf --mysqld case
| * | MDEV-18830: Port SST fixes from 10.4 to 10.1Jan Lindström2019-03-091-34/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: mysql-test/suite/galera/disabled.def modified: mysql-test/suite/galera/r/galera_many_rows.result modified: mysql-test/suite/galera/t/galera_kill_nochanges.test new file: mysql-test/suite/galera/t/galera_many_rows.cnf modified: mysql-test/suite/galera/t/galera_many_rows.test modified: mysql-test/suite/galera/t/galera_var_dirty_reads.test modified: scripts/wsrep_sst_mariabackup.sh
* | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-02-191-3/+5
|\ \ \ | |/ /
| * | 1. centos has symlinks /bin->usr/bin and /sbin -> usr/sbin,Oleksandr Byelkin2019-02-191-3/+5
| | | | | | | | | | | | | | | | | | | | | but even if this script called as /bin/mysql_install_db it is still standard install and scripts are in /usr/share/ (but not in the /share/) 2. fix of bindir path
| * | MDEV-18426: Most of the mtr tests in the galera_3nodes suite failJulius Goryavsky2019-02-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the mtr tests in the galera_3nodes suite fail for a variety of reasons with a variety of errors. This patch fixes several substantial flaws in the galera_3nodes suite tests and in the mtr framework service files, adapting the tests from galera_3nodes for the current version of MariaDB. This patch also synchronizes some galera_3nodes-related files with the latest changes made for MDEV-17835 (v2 patch) and for MDEV-18379 in other branches (10.2 and 10.3). Closes #1161
View Lorry Controller Status