summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Automatic mergeMichael Widenius2012-12-161-4/+4
|\
| * Removed extra '+' from some lines (remains of old merge)Michael Widenius2012-12-141-4/+4
* | 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
* | | | | | 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
* | | | | | 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
* | | | | | 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
View Lorry Controller Status