summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | 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
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| * | | | | | | | 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
* | | | | | | | post-merge fixes.Sergei Golubchik2011-07-021-5/+2
* | | | | | | | 5.5-mergeSergei Golubchik2011-07-0217-366/+196
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2011-04-071-0/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | 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
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merged the fix for bug #11936829 to 5.5.11 release Georgi Kodinov2011-03-311-0/+1
| * | | | | | Bug # 11766011: mysql.user.authentication_string column causes Georgi Kodinov2011-03-182-3/+3
| * | | | | | BUG#59752 : mysql.user.plugin length (60) vs. mysql.plugin.name length (64)Chuck Bell2011-03-112-3/+3
| * | | | | | MergeKent Boortz2010-12-2912-3/+154
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MergeKent Boortz2010-12-2913-2/+183
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | |
| | | * | | - Added/updated copyright headersKent Boortz2010-12-2816-4/+216
View Lorry Controller Status