summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 5.2 -> 5.3Sergei Golubchik2013-02-281-2/+2
|\
| * 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-2/+2
| |\
| | * mysql-5.1 mergeSergei Golubchik2013-02-281-2/+2
| | |\
| | | * Bug#16046140 BIN/MYSQLD_SAFE: TEST: ARGUMENT EXPECTEDNirbhay Choubey2012-12-271-2/+2
* | | | 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
| | | |/
* | | | 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
| | |\ \ | | | |/
| | | * Bug#13741677 MYSQL_SECURE_INSTALLATION DOES NOTNirbhay Choubey2012-07-262-8/+20
* | | | 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
* | | | mergeSergei Golubchik2012-04-052-4/+3
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-04-052-4/+3
| |\ \ \ | | |/ /
| | * | mysql-5.1.62 mergeSergei Golubchik2012-04-052-4/+3
| | |\ \ | | | |/
| | | * Updated/added copyright headersKent Boortz2012-02-152-3/+2
| | | |\
| | | | * Updated/added copyright headersKent Boortz2011-06-301-1/+2
| | | | |\
* | | | | | Added feature request from lp:956585 "Feature request - prevent truncating qu...Michael Widenius2012-03-271-6/+89
* | | | | | Fixes for make_binary_distribution and mysql_config for OpenSuse 12.1Michael Widenius2012-02-232-2/+6
* | | | | | Merge with 5.2.Michael Widenius2011-12-1120-15/+186
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-2420-15/+186
| |\ \ \ \ \ | | |/ / / /
| | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2120-15/+187
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTEDNirbhay Choubey2011-09-061-0/+5
| | | * | | Removing a stray line, went into the last push.Nirbhay Choubey2011-09-061-1/+0
| | | * | | Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTEDNirbhay Choubey2011-09-061-0/+6
| | | * | | Updated/added copyright headersKent Boortz2011-07-031-1/+2
| | | |\ \ \
| | | | * \ \ merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-03-211-0/+1
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Bug #59815: Missing License information with enterprise GPL packagesGeorgi Kodinov2011-02-081-0/+1
| | | * | | | Updated/added copyright headersKent Boortz2011-06-3018-38/+50
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/|
| | | | * | Updated/added copyright headersKent Boortz2011-06-3013-30/+43
| | | | |/
| | * | | Ensure that the last --datadir option is used from the my.cnf files.Michael Widenius2011-07-241-4/+1
* | | | | Added handler and temporary table usage to mytopMichael Widenius2011-12-031-2/+36
* | | | | Remove extra MariaDB- from binary tar.gz file nameMichael Widenius2011-10-161-0/+1
* | | | | Allow one to block an account by using GRANT max_user_connections = -1Michael Widenius2011-09-263-3/+9
* | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-14/+16
* | | | | Added mytop to distribution (with some small trivial changes to make it workg...Michael Widenius2011-06-275-2/+2350
* | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-283-11/+11
|\ \ \ \ \
| * | | | | microseconds in log tables:Sergei Golubchik2011-05-192-6/+6
| * | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-013-5/+5
* | | | | | mergeVladislav Vaintroub2011-03-267-46/+88
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge with base 5.2Michael Widenius2011-03-237-47/+86
| |\ \ \ \ \
| | * | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi...Michael Widenius2011-03-232-16/+38