summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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 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
* | | Don't do DBUG_ASSERT for checksum errors when using REPAIRMichael Widenius2011-01-071-1/+1
* | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-4/+2
* | | 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
* | | Updated failure text for maria_install_dbMichael Widenius2010-09-091-8/+4
* | | Merge with MySQL 5.1.50Michael Widenius2010-08-274-21/+28
|\ \ \ | |/ /
| * | Bug #54004 : mysql_secure_installation identifies "local host" incorrectlyGeorgi Kodinov2010-07-142-2/+2
| * | Bug #52274 : Missing path to mysql in mysql_secure_installationGeorgi Kodinov2010-07-091-1/+19
| * | Bug #53613: mysql_upgrade incorrectly revokes TRIGGER privilege on given tableGeorgi Kodinov2010-07-011-3/+1
* | | Trivial fixes, more safe DBUG_ASSERT()'s and some more DBUG_Michael Widenius2010-08-231-1/+1
* | | Added verbose mode to recoveryMichael Widenius2010-08-182-2/+30
* | | Fixed compiler warningsMichael Widenius2010-08-041-1/+1
* | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-3/+5
|\ \ \ | |/ /
| * | Bug#54590 "make_binary_distribution" fails because a commandJoerg Bruehe2010-06-171-3/+5
| |\ \ | | |/
| | * Bug#54590 "make_binary_distribution" fails because a commandJoerg Bruehe2010-06-171-3/+5
* | | Fix a loop and install more script files. Renames the perlscripts component t...Bo Thorsen2010-06-281-1/+5
* | | Implement an NSIS based installerBo Thorsen2010-06-251-0/+5
* | | Merge with MySQL 5.1.47Michael Widenius2010-05-262-1/+14
|\ \ \ | |/ /
| * | Bug #43594: mysqlhotcopy does not ignore log tables and others in mysql databaseGeorgi Kodinov2010-04-121-0/+8
| * | Bug #47095: Can't open_files_limit really be larger than 65535?Georgi Kodinov2010-04-091-1/+6
* | | Automerge latest MariaDB 5.1 trunk into 5.1.46 release.unknown2010-05-151-7/+7
|\ \ \
| * | | Build perl scripts in the correct directoryBo Thorsen2010-05-121-7/+7
| * | | Removed extra } that caused script to fail with syntax errorMichael Widenius2010-05-101-1/+0
* | | | Fixes after last merge of MySQL 5.1Michael Widenius2010-05-131-1/+1
* | | | Merge to get PBXT's xstat programMichael Widenius2010-05-122-0/+7
|\ \ \ \ | |/ / /
* | | | Merged MySQL 5.1.46 GPLed documentation into MariaDB.unknown2010-04-281-66/+66
|\ \ \ \
| * | | | Imported MySQL documentation files from ../mysql-5.1.46unknown2010-04-281-66/+66
* | | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-282-3/+19
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-03-091-3/+2
| * | | mergeGeorgi Kodinov2010-03-011-2/+19
| |\ \ \
| | * | | Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULLDavi Arnaut2010-02-261-2/+19
| * | | | Bug #51468: mysqld_multi is broken in 5.1.44Georgi Kodinov2010-02-261-1/+0
| |/ / /
| * | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-02-121-2/+3
* | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-042-0/+33
|\ \ \ \ | |/ / /
| * | | configure.inunknown2010-02-171-5/+1