Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -5/+5 |
|\ | |||||
| * | MDEV-6485 Hard-coded paths in the source cannot be opt-out | Sergei Golubchik | 2014-08-03 | 1 | -5/+5 |
* | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-27 | 1 | -2/+6 |
|\ \ | |||||
| * | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -2/+6 |
| |/ | |||||
* | | Change MySQL -> MariaDB inc scripts | Monty | 2014-08-09 | 1 | -25/+25 |
|/ | |||||
* | MDEV-4068 rpm scriptlet chown command dangerous | Sergei Golubchik | 2013-03-06 | 1 | -1/+1 |
* | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -0/+22 |
|\ | |||||
| * | 5.1 merge | Sergei Golubchik | 2013-01-10 | 1 | -0/+22 |
| |\ | |||||
| | * | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 1 | -0/+22 |
| | |\ | |||||
| | | * | Bug#11764559: UMASK IS IGNORED BY ERROR LOG | Tatjana Azundris Nuernberg | 2012-10-17 | 1 | -0/+22 |
* | | | | Moved init_log() to be later to not write log entries when one uses --example | Michael Widenius | 2012-06-08 | 1 | -1/+1 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+17 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -0/+17 |
| |\ \ \ | | |/ / | |||||
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -0/+17 |
| | |\ \ | | | |/ | |||||
* | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -0/+17 |
|\ \ \ \ | |||||
| * \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+4 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -18/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | Removed extra } that caused script to fail with syntax error | Michael Widenius | 2010-05-10 | 1 | -1/+0 |
* | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -0/+17 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge | Kent Boortz | 2010-12-29 | 1 | -0/+17 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -0/+17 |
| * | | | Bug #51468: mysqld_multi is broken in 5.1.44 | Georgi Kodinov | 2010-02-26 | 1 | -1/+0 |
| | |/ | |/| | |||||
| * | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -0/+3 |
* | | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-02-17 | 1 | -20/+2 |
|/ / | |||||
* | | automerge | Georgi Kodinov | 2009-06-19 | 1 | -1/+19 |
|\ \ | |/ | |||||
| * | Bug #36654: mysqld_multi cannot start instances with different versions | Georgi Kodinov | 2009-06-19 | 1 | -1/+19 |
* | | mysqld_multi still had mentions of safe_mysqld instead of mysqld_safe, | Jim Winstead | 2009-04-28 | 1 | -5/+5 |
|/ | |||||
* | Bug#43876: mysqld_multi introduces --no-defaults which screws up my system | Chad MILLER | 2009-04-02 | 1 | -5/+0 |
* | Bug#32136: mysqld_multi --defaults-file not respected while using \ | Chad MILLER | 2008-11-26 | 1 | -0/+5 |
* | make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am: | unknown | 2007-12-28 | 1 | -1/+1 |
* | Bug #27390: mysqld_multi --config-file= not working as documented | unknown | 2007-04-28 | 1 | -185/+127 |
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-01-31 | 1 | -0/+3 |
|\ | |||||
| * | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780 | unknown | 2007-01-22 | 1 | -0/+3 |
| |\ | |||||
| | * | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 | unknown | 2007-01-09 | 1 | -0/+3 |
| | |\ | |||||
| | | * | BUG#24780 workaround for broken installations that depend on using /etc, but ... | unknown | 2007-01-09 | 1 | -0/+3 |
* | | | | Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint | unknown | 2007-01-26 | 1 | -8/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | User visible change - breaks some environments, per Paul DuBois. Reverting in... | unknown | 2007-01-26 | 1 | -8/+0 |
| * | | | Merge siva.hindu.god:/usr/home/tim/m/bk/g41 | unknown | 2006-12-21 | 1 | -3/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
* | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/g50 | unknown | 2006-12-21 | 1 | -3/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work | unknown | 2006-12-07 | 1 | -3/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | BUG#24780 use --sysconfdir in scripts | unknown | 2006-12-07 | 1 | -3/+3 |
* | | | | Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint | unknown | 2006-12-15 | 1 | -0/+8 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | support /etc/mysql/my.cnf in mysqld_multi as well. | unknown | 2006-12-15 | 1 | -1/+9 |
| | |/ | |/| | |||||
* | | | Added /etc/mysql to my.cnf search path after /etc. | unknown | 2006-12-15 | 1 | -1/+9 |
| |/ |/| | |||||
* | | Manual merge of the fix for bug#16106. | unknown | 2006-01-16 | 1 | -3/+0 |
|\ \ | |/ | |||||
| * | Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1 | unknown | 2006-01-13 | 1 | -3/+0 |
| |\ | |||||
| | * | extra/comp_err.c + scripts/mysqld_multi.sh : | unknown | 2006-01-13 | 1 | -3/+0 |