summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-071-1/+1
|\
| * MDEV-12548 Initial implementation of Mariabackup for MariaDB 10.2Marko Mäkelä2017-07-051-1/+1
* | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-1/+1
|\ \ | |/
| * Merge 10.1 into 10.2Marko Mäkelä2017-06-081-1/+1
| |\
| | * MDEV-13032: fix galera_new_cluster to be POSIXDaniel Black2017-06-081-1/+1
* | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-265-21/+1105
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-092-19/+64
| |\ \ | | |/
| | * galera_new_cluster man page and sh typo=Ian Gilfillan2017-05-091-1/+1
| | * wsrep_new_cluster: Add -h and --help optionsJakub Dorňák2017-04-301-0/+16
| | * Merge branch '10.0' 10.1Sergei Golubchik2017-04-282-20/+48
| | |\
| | | * Merge branch '5.5' into 10.0Sergei Golubchik2017-04-212-20/+48
| | | |\
| | | | * Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-112-20/+48
| | | | |\
| | | | | * Bug#25144379 MYSQLD PROCESS DOES NOT INCLUDE FULL PATH WHEN STARTING MYSQL SE...Terje Rosten2017-02-131-66/+68
| | | | | * Bug#11751149 - TRYING TO START MYSQL WHILE ANOTHER INSTANCEShishir Jaiswal2016-12-221-14/+28
| | | | | * Bug#13344753 MYSQL_SECURE_INSTALLATION SCRIPT DOES NOT CHECK USER INPUTTerje Rosten2016-12-191-19/+48
| | | | | * Bug#25088048 ADDITIONAL ISSUES IN MYSQLD_SAFETerje Rosten2016-11-161-2/+16
| | | | | * Bug#24483092 UNSAFE USE OF VARIOUS SHELL UTILITIESTerje Rosten2016-10-062-27/+92
| | | | | * Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFETerje Rosten2016-08-261-2/+2
| | | | | * Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFETerje Rosten2016-08-181-32/+47
| * | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-063-2/+1041
| |\ \ \ \ \ | | |/ / / /
| | * | | | SST script for mariabackup.Nirbhay Choubey2017-04-272-0/+1041
| | * | | | don't generate wsrep_sst_common in-placeSergei Golubchik2017-04-272-2/+0
| | * | | | Fix Galera tests failures on 10.1 and 10.2Sachin Setiya2017-04-251-0/+1
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-05-052-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix Galera tests failures on 10.1 and 10.2Sachin Setiya2017-04-251-0/+1
|/ / / / /
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-302-26/+23
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-11941 - Lintian complains about executable bitsSergey Vojtovich2017-03-072-26/+23
* | | | | MDEV-11170: MariaDB 10.2 cannot start on MySQL 5.7 datadir:Vicențiu Ciorbaru2017-02-141-0/+6
* | | | | 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
| * | | | Post merge review fixesVicențiu Ciorbaru2017-01-171-4/+0
| * | | | 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
| | * | | | | 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
| * | | | | 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
| * | | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2016-09-282-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |