summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm...Michael Widenius2011-03-187-31/+48
* | | | mergeVladislav Vaintroub2011-03-111-1/+1
|\ \ \ \ | |/ / /
| * | | fix warningVladislav Vaintroub2011-03-111-1/+1
* | | | mergeVladislav Vaintroub2011-03-111-1/+0
|\ \ \ \ | |/ / /
| * | | remove unused variableVladislav Vaintroub2011-03-111-1/+0
* | | | merge mwl#55Vladislav Vaintroub2011-03-113-56/+100
|\ \ \ \ | |/ / /
| * | | merge 5.2Vladislav Vaintroub2011-03-101-5/+2
| |\ \ \ | | |/ /
| * | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-293-56/+100
* | | | Merge with 5.2Michael Widenius2011-03-091-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
* | | | | Merge with 5.1Michael Widenius2011-01-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-041-5/+7
|/ / / /
* | | | 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
* | | | make_win_bin_dist: include all dynamic plugins, not only innodb_pluginSergei Golubchik2010-09-161-14/+6
* | | | rename maria to ariaSergei Golubchik2010-09-122-4/+4
* | | | merge with 5.1Sergei Golubchik2010-09-115-29/+32
|\ \ \ \ | |/ / /
| * | | 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
* | | | Automerge with 5.1Michael Widenius2010-08-252-2/+30
|\ \ \ \ | |/ / /
| * | | 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
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-052-4/+6
|\ \ \ \ | |/ / /
| * | | 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
* | | | fixes for buildbotSergei Golubchik2010-07-251-2/+2
* | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+9
|\ \ \ \ | |/ / /