summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-11170: MariaDB 10.2 cannot start on MySQL 5.7 datadir:Vicențiu Ciorbaru2017-02-141-0/+6
| | | | | | | | | | | | | | | | | | | | Fatal error: mysql.user table is damaged or in unsupported 3.20 format The problem stems from MySQL 5.7.6. According to MySQL documentation: In MySQL 5.7.6, the Password column was removed and all credentials are stored in the authentication_string column. If opening a MySQL 5.7.6 (and up) datadir with MariaDB 10.2, the user table appears corrupted. In order to fix this, the server must be started with --skip-grant-tables and then a subsequent mysql_upgrade command must be issued. This patch updates the mysql_upgrade command to also add the removed Password column. The password column is necessary, otherwise the mysql_upgrade script fails due to the Event_scheduler not being able to start, as it can't find Event_priv in the table where it ought to be. MySQL's version has column position 28 (0 index) vs our datadir version expects position 29.
* Merge branch '10.1' into 10.2Sergei Golubchik2017-02-104-72/+94
|\
| * Minor typoiangilfillan2017-01-261-1/+1
| |
| * mysql_install_db enhancements to facilitate Debian bug#848616 fixKristian Nielsen2017-01-172-10/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Debian, the default install is made more secure by omitting the anonymous user and by making the root account authenticate by unix socket authentication instead of the default password-less root. However, Debian hard-codes this change in mysql_install_db, which breaks that program for other users. This commit instead implements new general options for mysql_install_db that can be used by anyone to similarly perform a more secure install: --skip-auth-anonymous-user: omits the anonymous user. --auth-root-authentication-method=normal: Keeps the existing behaviour with a password-less root account. Currently on by default. --auth-root-socket-user=USER --auth-root-authentication-method=socket: creates the MariaDB root user with the name USER (defaults to 'root') and using unix socket authentication. This way, only that user has MariaDB root access after install. The idea with --auth-root-authentication-method=normal is that applications that need this behaviour can give that option explicitly. Then eventually we could make --auth-root-authentication-method=socket the default, giving a more secure default installation. Note that it is perfectly possible to do a secure install with --auth-root-authentication-method=normal. For example, installing a private server just for local access by a single OS-level user, by using --skip-networking and putting the connection socket in a location without public access. So it is important to preserve this API for backwards compatibility.
| * Post merge review fixesVicențiu Ciorbaru2017-01-171-4/+0
| | | | | | | | | | | | | | | | * Remove duplicate lines from tests * Use thd instead of current_thd * Remove extra wsrep_binlog_format_names * Correctly merge union patch from 5.5 wrt duplicate rows. * Correctly merge SELinux changes into 10.1
| * Merge remote-tracking branch '10.0-galera' into 10.1Vicențiu Ciorbaru2017-01-161-8/+7
| |\
| | * Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-132-66/+51
| | |\
| | * \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-1/+5
| | |\ \
| * | \ \ Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-59/+50
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-121-2/+7
| | |\ \ \
| | | * | | mysqld_safe: don't close stdout if set -xSergei Golubchik2017-01-101-2/+7
| | | | | |
| | * | | | Fix problems from 5.5 mergeVicențiu Ciorbaru2017-01-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update mysqld_safe script to remove duplicated parameter --crash-script * Make --core-file-size accept underscores as well as dashes correctly. * Add mysqld_safe_helper to Debian and Ubuntu files. * Update innodb minor version to 35
| | * | | | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-63/+45
| | |\ \ \ \ | | | |/ / /
| | | * | | Numerous issues in mysqld_safeSergei Golubchik2016-12-221-63/+44
| | | | | |
* | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-295-41/+46
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-4/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-4/+2
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | MDEV-11242 MariaDB Server releases contains promotion of MariaDB CorporationSergei Golubchik2016-12-031-4/+2
| | | | |
| * | | | MDEV-11052 mariadb-service-convert does not work after upgrading to 10.1.18Sergei Golubchik2016-12-061-4/+5
| | | | | | | | | | | | | | | | | | | | mysqld_safe: don't close stdout and stderr if --dry-run
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-291-1/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-291-1/+5
| | |\ \ \ | | | |/ /
| | | * | mysqld_safe: close stdout and stderrSergei Golubchik2016-09-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | when they're not needed anymore. Helps when daemonizing it from mysql.init
| * | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2016-09-282-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | MDEV-10853 netcat help output in error log when running xtrabackup SSTHartmut Holzgraefe2016-09-282-2/+2
| | | | |
| * | | | MDEV-10832 Out of tree build: mysql_install_db to see all .sql files.Alexey Botchkov2016-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | One line in mysql_install_db.sh was left unfixed.
| * | | | MDEV-10832 - Out of tree build: mysql_install_db to see all .sql files (#237)Daniel Black2016-09-232-31/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Out of tree build: mysql_install_db to see all .sql files Since MDEV-7875 (da0991c6), not all sql source files are in the source directory, maria_add_gis_sp_bootstrap.sql is in the build directory. This corrects mysql_install_db{.sh} to be aware of the differing locations. Signed-off-by: Daniel Black <daniel.black@au.ibm.com> * Out of tree build: scripts/mysql_install_db.pl.in Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
| * | | | MDEV-10830 - Fix undefined database test error when running mysql_install_db ↵hf-10.1-wsrep-debugSeamus Lee2016-09-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#234) * Fix undefined database test error when running mysql_install_db When using mariaDb in docker mode it can fail as it calls mysql_install_db but as we are going through a slightly different install process the test database has not been created, therefore we should fall back to the mysql database as per https://mariadb.com/kb/en/mariadb/mariadb-10112-mysql_install_db-aborts-on-unkown-file-test/ * Also fix mysql_install_db.pl.in
* | | | | MDEV-10432: Post-fix after merging PR#205Nirbhay Choubey2016-11-211-21/+28
| | | | |
* | | | | Implement native/base process checks for FreeBSDBernard Spil2016-11-211-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | - Make rsync process checks OS-dependent - Use (BSD) netstat on FreeBSD (not lsof)
* | | | | POSIX-ify wsrep scriptsBernard Spil2016-11-212-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace #!/bin/bash with #!/bin/sh - Split username:password using POSIX compat %% and ## - Don't use array for FILTERS - Replace == tests with POSIX-compat =
* | | | | MDEV-9903 - 10.2 : Check and run rsync daemon only in the needed IPFrancisco Biete2016-11-071-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/MariaDB/server/pull/235 I submit this code under the BSD-new license.
* | | | | Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-218-13/+24
|\ \ \ \ \
| * \ \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2016-09-098-13/+24
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-254-6/+11
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2016-08-241-1/+2
| | | |\ \ \
| | | | * \ \ Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-102-2/+2
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | * | | MDEV-10487: Galera SST using rsync does not filter out lost+foundNirbhay Choubey2016-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rsync based SST method, during third phase of data transfer, 'lost+found' should be filtered out while recursively transferring files from various directories under data directory.
| | | | * | | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-231-2/+6
| | | | |\ \ \
| | | * | \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-242-2/+2
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | refs codership/mysql-wsrep#239sjaakola2016-08-213-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synced xtrabackup SST scripts from PXC source tree as of PXC 5.6.27-25.13 - PXC#480: xtrabackup-v2 SST fails with multiple log_bin directives in my.cn - PXC#460: wsrep_sst_auth don't work in Percona-XtraDB-Cluster-56-5.6.25-25. - PXC-416: Fix SST related issues. - PXC-389: Merge remote-tracking branch 'wsrep/5.6' into 5.6-wsrep-pxc389 - Bug #1431101: SST does not clobber backup-my.cnf
| | | * | | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-243-4/+8
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch '10.0' into 10.1Sergei Golubchik2016-08-252-2/+2
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-08-102-2/+2
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | MDEV-10248 Cannot Remove Test TablesElena Stepanova2016-07-152-2/+2
| | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | While dropping the test database, use IF EXISTS to avoid bogus errors
| | * | | | | MDEV-10396: MariaDB does not restart after upgrade on debian 8Nirbhay Choubey2016-07-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During wsrep position recovery, galera_recovery.sh script redirected mysqld's error log to a temporary file in order to find the start position. This, however, will not work if --log-error is configured for the server. Fixed by using --log-error in command line instead of redirection. [Patch contributed by Philippe MARASSE]
| | * | | | | MDEV-9588 Mariadb client-only build creates a useless mysqld_safe fileSergei Golubchik2016-07-131-5/+10
| | | | | | |
* | | | | | | mysqld_safe: don't use "$DATADIR/my.cnf"Sergei Golubchik2016-09-191-17/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | finally removed, after being deprecated since 2005
* | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-3010-13/+178
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-283-4/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-211-2/+6
| | |\ \ \ \