summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0-base -> 10.0unknown2013-05-281-1/+1
|\
| * MDEV-26: Global transaction ID.unknown2013-05-221-1/+1
* | Merge 10.0-base -> 10.0Igor Babaev2013-04-171-1/+1
|\ \ | |/
| * Merge 10.0-base -> mwl253Igor Babaev2013-04-152-2/+7
| |\
| * \ Merge 10.0-base -> mwl253.Igor Babaev2013-03-314-7/+14
| |\ \
| * | | Added the type of histogram for mwl #253.Igor Babaev2013-03-301-1/+1
| * | | Added histogams for table columns.Igor Babaev2013-03-251-1/+1
* | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-172-1/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-152-2/+7
| |\ \ \ | | |_|/ | |/| |
| | * | MDEV-26: Global transaction ID.unknown2013-01-251-2/+1
| | * | MDEV-26: Global transaction id: Intermediate commit.unknown2012-11-151-0/+6
| | |/
* | | 10.0-base mergeSergei Golubchik2013-04-154-7/+14
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-03-274-7/+14
| |\ \ | | |/ | |/|
| | * MDEV-4068 rpm scriptlet chown command dangerousSergei Golubchik2013-03-064-4/+4
| | * Automatic mergeMichael Widenius2013-03-011-1/+8
| | |\
| | | * Added support for --crash-script in mysqld_safe.Michael Widenius2013-02-281-1/+8
| | * | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Merge of patch for Bug#16046140 from mysql-5.1.Nirbhay Choubey2012-12-271-2/+2
| | | |\
| | | | * Bug#16046140 BIN/MYSQLD_SAFE: TEST: ARGUMENT EXPECTEDNirbhay Choubey2012-12-271-2/+2
* | | | | 10.0-base mergeSergei Golubchik2013-01-319-1508/+1561
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-01-299-434/+513
| |\ \ \ \ | | |/ / /
| | * | | MDEV-3952 Incompatible change in MariaDB-5.5.28a-client rpm adds mytop when n...Sergei Golubchik2013-01-201-1/+1
| | * | | mysql-5.5.29 mergeSergei Golubchik2013-01-151-23/+25
| | |\ \ \ | | | |/ /
| | | * | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| | | |\ \
| | | * | | Bug #13548161: MYSQLD_SAFE IMPROVEMENTS FOR 5.5 ALLWAYS SETS PLUGIN_DIR Georgi Kodinov2012-08-271-23/+25
| | | * | | Bug #14181049: MYSQL_INSTALL_DB.PL CREATES EMPTY SYSTEM TABLES FOR MYSQL Georgi Kodinov2012-08-241-3/+18
| | * | | | 5.3 mergeSergei Golubchik2013-01-153-1/+73
| | |\ \ \ \
| | | * \ \ \ 5.2->5.3 mergeSergei Golubchik2013-01-103-1/+73
| | | |\ \ \ \
| | | | * \ \ \ 5.1 mergeSergei Golubchik2013-01-103-1/+73
| | | | |\ \ \ \
| | | | | * \ \ \ mysql-5.1.67 mergeSergei Golubchik2013-01-093-4/+74
| | | | | |\ \ \ \ | | | | | | | |_|/ | | | | | | |/| |
| | | | | | * | | Automerge into main 5.1Joerg Bruehe2012-10-191-3/+18
| | | | | | |\ \ \ | | | | | | | |_|/ | | | | | | |/| |
| | | | | | | * | Backport this change from MySQL 5.5 to 5.1:Joerg Bruehe2012-09-111-3/+18
| | | | | | * | | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| | | | | | |/ /
| | * | | | | | Buildbot fixes and cleanups:Michael Widenius2013-01-111-3/+3
| | * | | | | | Fixed problem with failing mysql_upgrade when proc table was not correct.Michael Widenius2013-01-115-406/+411
* | | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-102-4/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 5.5 -> mwl248Igor Babaev2013-01-081-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Automatic mergeMichael Widenius2012-12-161-4/+4
| | |\ \ \ \ \ \
| | | * | | | | | Removed extra '+' from some lines (remains of old merge)Michael Widenius2012-12-141-4/+4
| * | | | | | | | Changed the names of the system tables for statistical data:Igor Babaev2012-12-051-3/+3
| * | | | | | | | Merge 5.5->mwl248Igor Babaev2012-12-043-8/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-0/+6
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge 5.5->5.5-mwl248.Igor Babaev2012-08-292-1944/+2005
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-262-5/+6
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Changed the type of all double columns in the system statistical tablesIgor Babaev2012-06-251-2/+2
| | * | | | | | | | | | MergeIgor Babaev2012-06-011-1/+3
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-114-13/+107
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merged 5.3 changes into the mwl #248 tree.Igor Babaev2012-03-092-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-0/+5
View Lorry Controller Status