Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/10.1' into 10.2 | Vicențiu Ciorbaru | 2017-12-22 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-12-20 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-12-20 | 1 | -2/+2 |
| | |\ | |||||
| | | * | MDEV-14337 mysqld_safe may suppress error messages with --log-output=file | Sergei Golubchik | 2017-11-10 | 1 | -2/+2 |
* | | | | Fixed that --malloc-lib works properly | Monty | 2017-11-01 | 1 | -19/+31 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-04 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-13950 mysqld_safe could not start Galera node after upgrade ... | sachin | 2017-10-02 | 1 | -2/+2 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-09-22 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-10767 /tmp/wsrep_recovery.${RANDOM} file created in unallowed SELinux co... | sachin | 2017-09-21 | 1 | -3/+3 |
| * | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -1/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -1/+0 |
| | |\ \ | | | |/ | |||||
| | | * | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 1 | -1/+0 |
| | | |\ | |||||
| | | | * | Bug#25144379 MYSQLD PROCESS DOES NOT INCLUDE FULL PATH WHEN STARTING MYSQL SE... | Terje Rosten | 2017-02-13 | 1 | -66/+68 |
| | | | * | Bug#11751149 - TRYING TO START MYSQL WHILE ANOTHER INSTANCE | Shishir Jaiswal | 2016-12-22 | 1 | -14/+28 |
| | | | * | Bug#25088048 ADDITIONAL ISSUES IN MYSQLD_SAFE | Terje Rosten | 2016-11-16 | 1 | -2/+16 |
| | | | * | Bug#24483092 UNSAFE USE OF VARIOUS SHELL UTILITIES | Terje Rosten | 2016-10-06 | 1 | -25/+84 |
| | | | * | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFE | Terje Rosten | 2016-08-26 | 1 | -2/+2 |
| | | | * | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFE | Terje Rosten | 2016-08-18 | 1 | -32/+47 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 1 | -61/+36 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Post merge review fixes | Vicențiu Ciorbaru | 2017-01-17 | 1 | -4/+0 |
| * | | | | Merge remote-tracking branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -8/+7 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -62/+49 |
| | |\ \ \ \ | | | |/ / / | |||||
| | * | | | | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -1/+5 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 1 | -1/+14 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2015-02-18 | 1 | -2/+12 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -16/+13 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | MDEV-4728: local merge from maria-5.5-galera. | Nirbhay Choubey | 2014-07-15 | 1 | -2/+13 |
| | * | | | | | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -23/+16 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | * Merging fix for lp:1224775mariadb-galera-10.0.7a | Nirbhay Choubey | 2014-04-02 | 1 | -39/+9 |
| | * | | | | | | | | | | | * mysqld_safe could not start server as it failedmariadb-galera-10.0.7 | Nirbhay Choubey | 2014-02-14 | 1 | -1/+1 |
| | * | | | | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. | Nirbhay Choubey | 2014-01-30 | 1 | -0/+1 |
| | * | | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -2/+37 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 1 | -3/+0 |
| | * | | | | | | | | | | | | | Merged revisions 3409..3411 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-06 | 1 | -2/+3 |
| | * | | | | | | | | | | | | | Merge fix. | Jan Lindström | 2013-09-09 | 1 | -0/+68 |
| | * | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -4/+110 |
| * | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -59/+50 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-01-12 | 1 | -2/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | mysqld_safe: don't close stdout if set -x | Sergei Golubchik | 2017-01-10 | 1 | -2/+7 |
| | * | | | | | | | | | | | | | Fix problems from 5.5 merge | Vicențiu Ciorbaru | 2017-01-10 | 1 | -2/+1 |
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -63/+45 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Numerous issues in mysqld_safe | Sergei Golubchik | 2016-12-22 | 1 | -63/+44 |
* | | | | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | MDEV-11052 mariadb-service-convert does not work after upgrading to 10.1.18 | Sergei Golubchik | 2016-12-06 | 1 | -4/+5 |
| * | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-29 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-29 | 1 | -1/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | mysqld_safe: close stdout and stderr | Sergei Golubchik | 2016-09-29 | 1 | -1/+5 |