summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | * | 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
| | | * | | | | 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
| | | | | |_|/ | | | | |/| |
| | * | | | | MDEV-10396: MariaDB does not restart after upgrade on debian 8Nirbhay Choubey2016-07-271-1/+2
| | * | | | | 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
|/ / / / / /
* | | | | | 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
| | |\ \ \ \
| | | * \ \ \ Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-211-2/+6
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-2/+6
| | | | |\ \ \
| | | | | * | | Bug#19920049 - MYSQLD_MULTI MISLEADING WHEN MY_PRINT_DEFAULTSShishir Jaiswal2016-03-011-2/+6
| | * | | | | | MDEV-9969 mysql_install_db error processing ignore_db_dirs.Alexey Botchkov2016-06-162-2/+2
| | |/ / / / /
| * | | | | | Use hostname instead of IP in donor's socatMartin Stefany2016-06-271-2/+7
| * | | | | | MDEV-10233: Support bootstraping a Galera cluster with mysqld_multiNirbhay Choubey2016-06-271-1/+8
| * | | | | | MDEV-10230: --wsrep_on option no longer passed through by mysqld_safeNirbhay Choubey2016-06-271-2/+9
| * | | | | | MDEV-10004: Galera's pc.recovery process fails in 10.1 with systemdNirbhay Choubey2016-06-271-0/+118
| * | | | | | MDEV-10119 mysql_install_db creates GIS procedures with invalid definer.Alexey Botchkov2016-06-271-2/+2
| * | | | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2016-05-051-1/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.25Nirbhay Choubey2016-04-291-1/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | MDEV-9884: Existing /var/lib/mysql/.sst directory (with contents) causes SST ...Nirbhay Choubey2016-04-271-1/+2
| | | * | | | Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-11/+16
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | * | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-292-10/+10
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| * | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | tests -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ciSergei Golubchik2016-04-241-1/+1
| * | | | | | Fixed assert if user table was mailformed.Monty2016-05-012-0/+23
* | | | | | | General spell fixing in comments and stringsOtto Kekäläinen2016-06-081-1/+1
* | | | | | | Drop old not used mysql.ndb_binlog_index if existsMonty2016-05-011-0/+6
* | | | | | | Removed file-key-management from mysql_install_db as someone may haveMichael Widenius2016-04-071-1/+0
* | | | | | | Fix the buildbot: file-key-management is provided by a plugin, so should be l...Sergei Petrunia2016-04-061-1/+1
* | | | | | | Cleanups:Monty2016-04-051-2/+4
* | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-03-232-11/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-9/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-2/+2
| | * | | | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-7/+7
| * | | | | | MDEV-9598: Donor's rsync SST script hangs if FTWRL failsNirbhay Choubey2016-02-261-2/+15
* | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-253-12/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-242-7/+9
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | - PXC#480: xtrabackup-v2 SST fails with multiple log_bin directives in my.cnfKrunal Bauskar2016-02-231-1/+5
| | * | | | | - PXC#460: wsrep_sst_auth don't work in Percona-XtraDB-Cluster-56-5.6.25-25.1...Krunal Bauskar2016-02-232-6/+4