summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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.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.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-261-1/+3
|\ \ \ | |/ /
| * | always force the language in mysql_install_dbSergei Golubchik2012-09-261-1/+3
* | | 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
|\ \ \ | |/ /
| * | 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
| | | |\
* | | | \ 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
* | | | 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
| * | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm...Michael Widenius2011-03-187-31/+48
* | | | | fix warningVladislav Vaintroub2011-03-111-1/+1
* | | | | remove unused variableVladislav Vaintroub2011-03-111-1/+0
* | | | | merge 5.2Vladislav Vaintroub2011-03-101-5/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-5/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-5/+2
| | |\ \ \ | | | |/ /
| | | * | MergeKent Boortz2010-12-2913-2/+183
| | | |\ \ | | | | |/
| | | | * - Added/updated copyright headersKent Boortz2010-12-2816-4/+216
| | | * | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-242-5/+5
| | | |\ \ | | | | |/
| | | | * A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remov...Alexander Nozdrin2010-11-243-5/+5
* | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-293-56/+100
|/ / / /
* | | | merge with 5.1Michael Widenius2011-01-071-1/+1
|\ \ \ \ | |/ / /
| * | | Don't do DBUG_ASSERT for checksum errors when using REPAIRMichael Widenius2011-01-071-1/+1
* | | | Merge with 5.1Michael Widenius2010-12-041-2/+0
|\ \ \ \ | |/ / /
| * | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-4/+2
* | | | merge with 5.1Sergei Golubchik2010-10-251-0/+1
|\ \ \ \ | |/ / /
| * | | 5.1.51 mergeSergei Golubchik2010-10-191-0/+1
| |\ \ \ | | |/ /
| | * | Bug#55846: Link tests fail on Windows - my_compiler.h missingDavi Arnaut2010-08-241-0/+1