summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-183-8/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-222-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-092-8/+20
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-082-8/+20
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-062-8/+20
| | | | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | MDEV-3826 compilation of client programs fail: m_string.h tries to include <m...Sergei Golubchik2012-11-151-6/+5
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | MDEV-3816 init-file stops getting executed if a long enough line is encounter...Sergei Golubchik2012-12-161-6/+31
* | | | | | | | | | | | | | merge with 5.5Sergei Golubchik2012-11-034-48/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fix the incorrect mergeSergei Golubchik2012-10-191-2/+3
| * | | | | | | | | | | | | 5.3 mergeSergei Golubchik2012-10-181-22/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | mergeSergei Golubchik2012-09-271-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | mergeSergei Golubchik2012-09-261-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | always force the language in mysql_install_dbSergei Golubchik2012-09-261-1/+3
| | * | | | | | | | | | | | mergeSergei Golubchik2012-09-241-21/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | mergeSergei Golubchik2012-09-241-21/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | MDEV-543 mysql_install_db doesn't work with blanks in either basedir or datad...Sergei Golubchik2012-09-241-21/+25
| * | | | | | | | | | | | | RPM fixes:Sergei Golubchik2012-10-171-1/+0
| * | | | | | | | | | | | | mysql-5.5.28Sergei Golubchik2012-10-163-27/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Bug #12992993 MYSQLHOTCOPY FAILS IF VIEW EXISTSVenkata Sidagam2012-08-141-19/+69
| | * | | | | | | | | | | | Merge of patch for Bug#13741677 from mysql-5.1.Nirbhay Choubey2012-07-262-8/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Bug#13741677 MYSQL_SECURE_INSTALLATION DOES NOTNirbhay Choubey2012-07-262-8/+20
* | | | | | | | | | | | | | RPM fixes:Sergei Golubchik2012-10-271-1/+0
* | | | | | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-193-2013/+2083
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Updated mytop to version 1.91Michael Widenius2012-09-221-69/+78
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | MDEV-471 update help tables.Alexey Botchkov2012-08-281-1943/+2003
| * | | | | | | | | | | | MDEV-286 mytop is not installed in 5.5Sergei Golubchik2012-08-131-1/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | don't disable innodb in bootstrap anymoreSergei Golubchik2012-10-082-2/+1
* | | | | | | | | | | | fixes for test failuresSergei Golubchik2012-09-272-3/+1
* | | | | | | | | | | | Compile 10.0 on WindowsVladislav Vaintroub2012-08-301-8/+4
* | | | | | | | | | | | Fixing test casesMichael Widenius2012-08-231-0/+40
* | | | | | | | | | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-0/+3
* | | | | | | | | | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-012-226/+1298
|/ / / / / / / / / / /
* | | | | | | | | | | various documentation updatesDaniel Bartholomew2012-06-181-4/+5
* | | | | | | | | | | Moved init_log() to be later to not write log entries when one uses --exampleMichael Widenius2012-06-081-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Building RPMs with CPackSergei Golubchik2012-05-221-1/+3
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
View Lorry Controller Status