Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5 merge | Sergei Golubchik | 2013-03-27 | 4 | -7/+14 |
|\ | |||||
| * | MDEV-4068 rpm scriptlet chown command dangerous | Sergei Golubchik | 2013-03-06 | 4 | -4/+4 |
| * | Automatic merge | Michael Widenius | 2013-03-01 | 1 | -1/+8 |
| |\ | |||||
| | * | Added support for --crash-script in mysqld_safe. | Michael Widenius | 2013-02-28 | 1 | -1/+8 |
| * | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge of patch for Bug#16046140 from mysql-5.1. | Nirbhay Choubey | 2012-12-27 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Bug#16046140 BIN/MYSQLD_SAFE: TEST: ARGUMENT EXPECTED | Nirbhay Choubey | 2012-12-27 | 1 | -2/+2 |
* | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 9 | -434/+513 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-3952 Incompatible change in MariaDB-5.5.28a-client rpm adds mytop when n... | Sergei Golubchik | 2013-01-20 | 1 | -1/+1 |
| * | | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -23/+25 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#11764559: UMASK IS IGNORED BY ERROR LOG | Tatjana Azundris Nuernberg | 2012-10-17 | 2 | -1/+56 |
| | |\ \ | |||||
| | * | | | Bug #13548161: MYSQLD_SAFE IMPROVEMENTS FOR 5.5 ALLWAYS SETS PLUGIN_DIR | Georgi Kodinov | 2012-08-27 | 1 | -23/+25 |
| | * | | | Bug #14181049: MYSQL_INSTALL_DB.PL CREATES EMPTY SYSTEM TABLES FOR MYSQL | Georgi Kodinov | 2012-08-24 | 1 | -3/+18 |
| * | | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 3 | -1/+73 |
| |\ \ \ \ | |||||
| | * \ \ \ | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 3 | -1/+73 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | 5.1 merge | Sergei Golubchik | 2013-01-10 | 3 | -1/+73 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 3 | -4/+74 |
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| | | |||||
| | | | | * | | | Automerge into main 5.1 | Joerg Bruehe | 2012-10-19 | 1 | -3/+18 |
| | | | | |\ \ \ | | | | | | |_|/ | | | | | |/| | | |||||
| | | | | | * | | Backport this change from MySQL 5.5 to 5.1: | Joerg Bruehe | 2012-09-11 | 1 | -3/+18 |
| | | | | * | | | Bug#11764559: UMASK IS IGNORED BY ERROR LOG | Tatjana Azundris Nuernberg | 2012-10-17 | 2 | -1/+56 |
| | | | | |/ / | |||||
| * | | | | | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 1 | -3/+3 |
| * | | | | | | Fixed problem with failing mysql_upgrade when proc table was not correct. | Michael Widenius | 2013-01-11 | 5 | -406/+411 |
* | | | | | | | Merge 5.5 -> mwl248 | Igor Babaev | 2013-01-08 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Automatic merge | Michael Widenius | 2012-12-16 | 1 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Removed extra '+' from some lines (remains of old merge) | Michael Widenius | 2012-12-14 | 1 | -4/+4 |
* | | | | | | | | Changed the names of the system tables for statistical data: | Igor Babaev | 2012-12-05 | 1 | -3/+3 |
* | | | | | | | | Merge 5.5->mwl248 | Igor Babaev | 2012-12-04 | 3 | -8/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 2 | -8/+20 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 2 | -8/+20 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | * | | | | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 2 | -8/+20 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| * | | | | | | | MDEV-3826 compilation of client programs fail: m_string.h tries to include <m... | Sergei Golubchik | 2012-11-15 | 1 | -6/+5 |
* | | | | | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-11-02 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge 5.5->5.5-mwl248. | Igor Babaev | 2012-08-29 | 2 | -1944/+2005 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 2 | -5/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Changed the type of all double columns in the system statistical tables | Igor Babaev | 2012-06-25 | 1 | -2/+2 |
| * | | | | | | | | | Merge | Igor Babaev | 2012-06-01 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 4 | -13/+107 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merged 5.3 changes into the mwl #248 tree. | Igor Babaev | 2012-03-09 | 2 | -2/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -0/+5 |
* | | | | | | | | | | | | | | Fix the incorrect merge | Sergei Golubchik | 2012-10-19 | 1 | -2/+3 |
* | | | | | | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -22/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | merge | Sergei Golubchik | 2012-09-27 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | merge | Sergei Golubchik | 2012-09-26 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | always force the language in mysql_install_db | Sergei Golubchik | 2012-09-26 | 1 | -1/+3 |
| * | | | | | | | | | | | | | merge | Sergei Golubchik | 2012-09-24 | 1 | -21/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | merge | Sergei Golubchik | 2012-09-24 | 1 | -21/+25 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | MDEV-543 mysql_install_db doesn't work with blanks in either basedir or datad... | Sergei Golubchik | 2012-09-24 | 1 | -21/+25 |
* | | | | | | | | | | | | | | RPM fixes: | Sergei Golubchik | 2012-10-17 | 1 | -1/+0 |