Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -6/+9 |
|\ | |||||
| * | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -6/+9 |
| |\ | |||||
| | * | Merge from mysq-5.1 to mysql-5.5 | Sujatha Sivakumar | 2013-02-19 | 1 | -5/+9 |
| | |\ | |||||
| | | * | Bug#11746817:MYSQL_INSTALL_DB CREATES WILDCARD GRANTS WHEN | Sujatha Sivakumar | 2013-02-19 | 1 | -5/+9 |
* | | | | References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..... | Seppo Jaakola | 2013-05-25 | 5 | -19/+12 |
* | | | | References: MDEV-4572 - merge with mariaDB 5.5.30 | Seppo Jaakola | 2013-05-24 | 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 |
* | | | | merged in revisions 3853..3857 from lp:codership-mysql/5.5-23 | Seppo Jaakola | 2013-05-21 | 2 | -22/+39 |
* | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 9 | -438/+517 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 |
| * | | | | | | 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 |
* | | | | | | | | merged with codership-mysql up to revision 3839 | Seppo Jaakola | 2013-02-05 | 2 | -10/+17 |
* | | | | | | | | remerging wsrep files from lp:codership-mysql | Seppo Jaakola | 2013-02-05 | 4 | -0/+659 |
* | | | | | | | | re-merging wsrep files from lp:codership-mysql | Seppo Jaakola | 2013-02-05 | 4 | -659/+0 |
* | | | | | | | | References: lp:1066784 - Merged with MariaDB 5.5.28a | Seppo Jaakola | 2012-11-30 | 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 |
* | | | | | | | | References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysql | Seppo Jaakola | 2012-11-28 | 3 | -11/+36 |
* | | | | | | | | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 5 | -117/+194 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 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 |