summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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
* mergeSergei Golubchik2012-04-071-1/+1
|\
| * mergeSergei Golubchik2012-04-052-4/+3
| |\
| | * mergeSergei Golubchik2012-04-052-4/+3
| | |\
| | | * mysql-5.1.62 mergeSergei Golubchik2012-04-052-4/+3
| | | |\
* | | | \ automatic mergeMichael Widenius2012-04-021-3/+15
|\ \ \ \ \
| * | | | | Fixed lp:886484 "nowatch option for mysqld (allow systemd)"Michael Widenius2012-04-021-3/+15
* | | | | | 5.3 mergeSergei Golubchik2012-03-281-6/+89
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Added feature request from lp:956585 "Feature request - prevent truncating qu...Michael Widenius2012-03-271-6/+89
* | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-282-3/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Updated/added copyright headersMySQL Build Team2012-02-162-3/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2012-02-152-3/+2
| | |\ \ \ \
| | | * \ \ \ Updated/added copyright headersKent Boortz2011-06-301-1/+2
| | | |\ \ \ \
* | | | \ \ \ \ merge with mysql-5.5.21Sergei Golubchik2012-03-091-0/+38
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Bug #11761530: 54035: MSYQLD_SAFE BEHAVIOUR CONSUMES TOO MUCH CPU IF IT IS UN...Georgi Kodinov2011-11-101-0/+38
* | | | | | | | 5.3 mergeSergei Golubchik2012-02-242-1/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fixes for make_binary_distribution and mysql_config for OpenSuse 12.1Michael Widenius2012-02-232-2/+6
* | | | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-0/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | fix for bug 11748060/34981unknown2011-11-171-0/+3
* | | | | | | | 5.3 mergeSergei Golubchik2012-01-139-11/+64
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | 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
* | | | | | | | rename debug variable to debug_dbug, to make test pass in release buildsSergei Golubchik2011-12-151-1/+1
* | | | | | | | Fix build and packaging on Windows:Vladislav Vaintroub2011-11-261-8/+2
* | | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-223-2/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
* | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0320-32/+102
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Bug #58241Joerg Bruehe2011-09-133-769/+2
| * | | | | | | Local merge from mysql-5.1.Nirbhay Choubey2011-09-061-0/+5
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTEDNirbhay Choubey2011-09-061-0/+5
| * | | | | | | Local merge from mysql-5.1.Nirbhay Choubey2011-09-061-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Removing a stray line, went into the last push.Nirbhay Choubey2011-09-061-1/+0
| * | | | | | | Local merge of patch for bug#11765888 from mysql-5.1.Nirbhay Choubey2011-09-061-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#11765888 58898: MYSQL_INSTALL_DB: NOT ALL OPTIONS DOCUMENTEDNirbhay Choubey2011-09-061-0/+6
| | * | | | | | Updated/added copyright headersKent Boortz2011-07-031-1/+2
| | |\ \ \ \ \ \
| * | | | | | | | BUG#11878394 - MYSQLD_SAFE TEST FOR ALREADY RUNNING PROCESSNirbhay Choubey2011-09-021-4/+4
| * | | | | | | | Updated/added copyright headersKent Boortz2011-06-3020-37/+45
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Updated/added copyright headersKent Boortz2011-06-3018-38/+50
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Updated/added copyright headersKent Boortz2011-06-3013-30/+43
* | | | | | | | | merge with 5.3Sergei Golubchik2011-10-1915-160/+2530
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | 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
View Lorry Controller Status