summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* small enhancement of the create table options feature:mariadb-5.2.6Sergei Golubchik2011-05-108-47/+58
* Fix Windows embedded warningsVladislav Vaintroub2011-05-102-4/+4
* Cygwin-specific klugde to workaround missing TEMP/TMP variables.Vladislav Vaintroub2011-05-101-0/+1
* Automatic merge Mariadb 5.1->5.2.unknown2011-05-093-0/+7
|\
| * Fix buildbot failure in rpl_stop_slave.test.unknown2011-05-093-0/+7
* | Make event stop code even more robust.Michael Widenius2011-05-091-1/+8
* | mysqltest: Write command to be executed to the log BEFORE executing the command.Michael Widenius2011-05-093-8/+39
* | Automatic mergeMichael Widenius2011-05-0810-6/+113
|\ \
| * \ Automatic merge with 5.1Michael Widenius2011-05-0810-6/+113
| |\ \ | | |/
| | * Reverted unittest/unit.pl back to Test::Harness as some of our build machines...Michael Widenius2011-05-062-16/+12
| | * Speed up pbxt.range test a bitMichael Widenius2011-05-052-0/+5
| | * Improved 'make test-unit' time slightlyMichael Widenius2011-05-058-9/+115
* | | Fix effect of recent mismerge (it made default pid file name ".pid" instea...Vladislav Vaintroub2011-05-071-8/+9
|/ /
* | Automatic mergeMichael Widenius2011-05-046-9/+22
|\ \
| * \ Automatic merge with 5.1Michael Widenius2011-05-047-10/+23
| |\ \ | | |/
| | * Automatic mergeMichael Widenius2011-05-041-0/+6
| | |\
| | | * Fixed build errors on centos5-amd64-minimal, where we compile with very few c...Michael Widenius2011-05-046-9/+22
| | * | Fixed build errors on centos5-amd64-minimal, where we compile with very few c...Michael Widenius2011-05-045-9/+16
| | |/
* | | mergeVladislav Vaintroub2011-05-041-1/+1
|\ \ \ | | |/ | |/|
| * | mergeVladislav Vaintroub2011-05-043-1/+3
| |\ \
| | * | Cherrypick fix for maria recovery bug LPBUG#686006 from 5.2Vladislav Vaintroub2011-05-042-0/+2
| | * | Avoid mtr warning on Windows during startup Vladislav Vaintroub2011-05-041-1/+1
* | | | fix noisy warnings in header filesVladislav Vaintroub2011-05-043-3/+2
| |_|/ |/| |
* | | Automatic mergeMichael Widenius2011-05-041-1/+1
|\ \ \ | |/ /
| * | Automatic mergeMichael Widenius2011-05-041-1/+1
| |\ \ | | |/ | |/|
| * | mergeVladislav Vaintroub2011-05-031-1/+1
| |\ \
| | * \ mergeVladislav Vaintroub2011-05-035-9/+10
| | |\ \ | | |/ / | |/| |
| | * | Fix warning (unused local variable)Vladislav Vaintroub2011-05-031-1/+1
* | | | Automatic merge with 5.1Michael Widenius2011-05-041-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed compiler warningMichael Widenius2011-05-041-1/+1
| |/ /
* | | Fixed typo that caused compiler warningMichael Widenius2011-05-041-1/+1
* | | Automatic merge with MariaDB 5.1Michael Widenius2011-05-038-12/+14
|\ \ \ | |/ /
| * | Automatic mergeMichael Widenius2011-05-035-9/+10
| |\ \ | | |/ | |/|
| | * Fixed after-merge failures found by buildbotMichael Widenius2011-05-035-9/+10
| * | Fix Xtradb compile error on Win64 - conversion between pointers of different ...Vladislav Vaintroub2011-05-031-1/+1
| * | Fix compile errors:Vladislav Vaintroub2011-05-022-2/+3
| |/
* | Merge with MariaDB 5.1Michael Widenius2011-05-03607-4283/+10981
|\ \ | |/
| * Automatic mergeMichael Widenius2011-05-02539-3381/+9690
| |\
| | * Merge with xtradb fixesMichael Widenius2011-05-0270-899/+1326
| | |\ | | |/ | |/|
| * | Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-2970-899/+1326
| |\ \
| | * | Updated with changes from Percona Server 5.1.56-12.7, fromunknown2011-04-2983-1280/+1976
| | | * Merge with MySQL 5.1.57/58Michael Widenius2011-05-02538-3379/+9684
| | | |\
| | | | * BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORTNirbhay Choubey2011-04-271-2/+10
| | | | * Bug#11889186 60503: CRASH IN MAKE_DATE_TIME WITH DATE_FORMAT / STR_TO_DATE C...Sergey Glukhov2011-04-274-4/+25
| | | | * merge from 5.1Guilhem Bichot2011-04-261-5/+5
| | | | |\
| | | | | * mergeMattias Jonsson2011-04-262-8/+12
| | | | | |\
| | | | | * | post fix for werror build for bug#11766249.Mattias Jonsson2011-04-261-5/+5
| | | | * | | Fix for Bug#11765141 - "58072: LOAD DATA INFILE: LEAKS IO CACHE MEMORY WHEN E...Guilhem Bichot2011-04-073-5/+28
| | | | | |/ | | | | |/|
| | | | * | BUG#12371924. Fxi test caseSerge Kozlov2011-04-252-8/+12
| | | | |/
| | | | * mergeMattias Jonsson2011-04-2312-154/+351
| | | | |\