Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 10 | -13/+178 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 3 | -4/+8 |
| |\ | |||||
| | * | Merge branch 'bb-10.0-serg' into 10.0 | Sergei Golubchik | 2016-06-21 | 1 | -2/+6 |
| | |\ | |||||
| | | * | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -2/+6 |
| | | |\ | |||||
| | | | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-06-14 | 1 | -2/+6 |
| | | | |\ | |||||
| | | | | * | Bug#19920049 - MYSQLD_MULTI MISLEADING WHEN MY_PRINT_DEFAULTS | Shishir Jaiswal | 2016-03-01 | 1 | -2/+6 |
| | * | | | | MDEV-9969 mysql_install_db error processing ignore_db_dirs. | Alexey Botchkov | 2016-06-16 | 2 | -2/+2 |
| | |/ / / | |||||
| * | | | | Use hostname instead of IP in donor's socat | Martin Stefany | 2016-06-27 | 1 | -2/+7 |
| * | | | | MDEV-10233: Support bootstraping a Galera cluster with mysqld_multi | Nirbhay Choubey | 2016-06-27 | 1 | -1/+8 |
| * | | | | MDEV-10230: --wsrep_on option no longer passed through by mysqld_safe | Nirbhay Choubey | 2016-06-27 | 1 | -2/+9 |
| * | | | | MDEV-10004: Galera's pc.recovery process fails in 10.1 with systemd | Nirbhay Choubey | 2016-06-27 | 1 | -0/+118 |
| * | | | | MDEV-10119 mysql_install_db creates GIS procedures with invalid definer. | Alexey Botchkov | 2016-06-27 | 1 | -2/+2 |
| * | | | | Merge branch '10.0-galera' into 10.1 | Nirbhay Choubey | 2016-05-05 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.25 | Nirbhay Choubey | 2016-04-29 | 1 | -1/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | MDEV-9884: Existing /var/lib/mysql/.sst directory (with contents) causes SST ... | Nirbhay Choubey | 2016-04-27 | 1 | -1/+2 |
| | | * | | | | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -11/+16 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | * | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 2 | -10/+10 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| * | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | tests -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci | Sergei Golubchik | 2016-04-24 | 1 | -1/+1 |
| * | | | | | | Fixed assert if user table was mailformed. | Monty | 2016-05-01 | 2 | -0/+23 |
* | | | | | | | General spell fixing in comments and strings | Otto Kekäläinen | 2016-06-08 | 1 | -1/+1 |
* | | | | | | | Drop old not used mysql.ndb_binlog_index if exists | Monty | 2016-05-01 | 1 | -0/+6 |
* | | | | | | | Removed file-key-management from mysql_install_db as someone may have | Michael Widenius | 2016-04-07 | 1 | -1/+0 |
* | | | | | | | Fix the buildbot: file-key-management is provided by a plugin, so should be l... | Sergei Petrunia | 2016-04-06 | 1 | -1/+1 |
* | | | | | | | Cleanups: | Monty | 2016-04-05 | 1 | -2/+4 |
* | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 2 | -11/+24 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -9/+9 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Update AskMonty and Atlassian references to MariaDB | iangilfillan | 2016-03-08 | 1 | -2/+2 |
| | * | | | | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -7/+7 |
| * | | | | | | MDEV-9598: Donor's rsync SST script hangs if FTWRL fails | Nirbhay Choubey | 2016-02-26 | 1 | -2/+15 |
* | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-02-25 | 3 | -12/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-02-24 | 2 | -7/+9 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | - PXC#480: xtrabackup-v2 SST fails with multiple log_bin directives in my.cnf | Krunal Bauskar | 2016-02-23 | 1 | -1/+5 |
| | * | | | | | - PXC#460: wsrep_sst_auth don't work in Percona-XtraDB-Cluster-56-5.6.25-25.1... | Krunal Bauskar | 2016-02-23 | 2 | -6/+4 |
| * | | | | | | MDEV-9529 - do not install sql script to BINDIR | Vladislav Vaintroub | 2016-02-22 | 1 | -5/+0 |
* | | | | | | | Merge branch '10.1' into 10.2 | Monty | 2016-02-06 | 3 | -52/+33 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-7875 Duplicate maria_add_gis_sp script in the sources. | Alexey Botchkov | 2016-01-25 | 3 | -52/+33 |
* | | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Alexander Barkov | 2015-12-29 | 5 | -50/+57 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute paths | Sergey Vojtovich | 2015-12-22 | 1 | -21/+20 |
| * | | | | | | Merge branch '10.1' into bb-10.1-serg | Sergei Golubchik | 2015-12-22 | 1 | -12/+22 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | MDEV-9141 : [PATCH] Add CA validation to wsrep_sst_xtrabackup-v2.sh | Nirbhay Choubey | 2015-12-20 | 1 | -12/+22 |
| * | | | | | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-12-22 | 1 | -11/+0 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 3 | -12/+19 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | * | | | | | | Remove duplicate code. | Nirbhay Choubey | 2015-11-20 | 1 | -11/+0 |
| * | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -6/+14 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -6/+14 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | MDEV-7341 mysqld_multi doesn't recognize include directive (not following inc... | Sergei Golubchik | 2015-12-07 | 1 | -6/+14 |
| * | | | | | | Fix syntax error in wsrep_sst_common.sh.mariadb-10.1.9 | Nirbhay Choubey | 2015-11-20 | 1 | -0/+1 |
* | | | | | | | MDEV-9297 - mysql_install_db launches mysqld 3x | Sergey Vojtovich | 2015-12-29 | 1 | -21/+1 |
* | | | | | | | MDEV-7376 - Removal of the tool "mysql_zap" | Sergey Vojtovich | 2015-11-26 | 2 | -173/+0 |