summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-12-0210-29/+47
|\
| * address review commentsVladislav Vaintroub2010-12-021-7/+6
| * Adapt fix_vs_config_dir () for VS2010Vladislav Vaintroub2010-12-011-3/+2
| * Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-019-21/+41
|/
* Automatic merge with 5.1-releaseMichael Widenius2010-11-304-3/+7
|\
| * Fixed some compiler warningsMichael Widenius2010-11-304-3/+7
* | Use three digits after the decimal point for better resolution and comparabil...Hakan Kuecuekyilmaz2010-11-291-1/+1
* | Automatic merge with 5.1-releaseMichael Widenius2010-11-29519-5725/+11567
|\ \ | |/
| * Fixed compiler and gmake warningsMichael Widenius2010-11-2975-231/+26
| * Fixed compiler warnings and a compilation failure on windowsMichael Widenius2010-11-277-12/+30
| * Patch from Sergey Petrunya:Michael Widenius2010-11-263-37/+85
| * Automatic merge with 5.1Michael Widenius2010-11-255-4/+95
| |\ | |/ |/|
* | Fix of LP BUG#675248.unknown2010-11-235-4/+95
| * Fixed failing test casesMichael Widenius2010-11-257-117/+118
| * Merge of innodb_plugin for MySQL 5.1.53 with xtradbMichael Widenius2010-11-2524-205/+541
| * A proper fix for bug #57688.Michael Widenius2010-11-253-4/+12
| * Automatic merge with baseMichael Widenius2010-11-25184-722/+6256
| |\
| | * Merge with MySQL 5.1.53Michael Widenius2010-11-25184-722/+6256
| | |\
| | | * mergeGeorgi Kodinov2010-11-030-0/+0
| | | |\
| | | | * Merge from mysql-5.1.52-releaseunknown2010-11-01155-1815/+4059
| | | | |\
| | | * | | test case fixSergey Glukhov2010-11-011-0/+2
| | | * | | mergeGeorgi Kodinov2010-10-290-0/+0
| | | |\ \ \
| | | | * \ \ merge to 5.0-securityGeorgi Kodinov2010-10-295-19/+92
| | | | |\ \ \
| | | * | \ \ \ merge to 5.1-securityGeorgi Kodinov2010-10-29155-698/+5737
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-10-2954-350/+4361
| | | | |\ \ \ \ \
| | | | | * | | | | Bug#52062: Compiler warning in os0file.c on windows 64-bitCalvin Sun2010-10-281-6/+22
| | | | | * | | | | Bug#52062: Compiler warning in os0file.c on windows 64-bitCalvin Sun2010-10-271-4/+20
| | | | | * | | | | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-10-2790-250/+876
| | | | | |\ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Fixed bug numbers in disabled.def filesAnitha Gopi2010-10-273-5/+5
| | | | * | | | | | merge from 5.1-mtrBjorn Munch2010-10-2519-37/+46
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Follow-up to Bug #55582 which allows checking strings in ifBjorn Munch2010-10-2115-26/+26
| | | | | * | | | | | Fixed wrong feof check in read_line, see 52019Bjorn Munch2010-10-201-1/+1
| | | | | * | | | | | Fixed missing cast of arg to my_mbcharlenBjorn Munch2010-10-201-1/+1
| | | | | * | | | | | 48863 followup: move an array declaration out from within if blockBjorn Munch2010-10-201-1/+1
| | | | | * | | | | | Bug #52019 main.mysqltest fails on new tests for lowercase_resultBjorn Munch2010-10-201-1/+1
| | | | | * | | | | | Bug #56654 pb2 log is very hard to readBjorn Munch2010-10-191-4/+13
| | | | | * | | | | | Bug #52828 Tests that use perl fail when perl is not in pathBjorn Munch2010-10-191-1/+1
| | | | | * | | | | | Test wait_timeout: do not fail by SQL syntax error, use dieBjorn Munch2010-10-191-2/+2
| | | | * | | | | | | Bug#27606 GRANT statement should be replicated with DEFINER informationunknown2010-10-236-8/+58
| | | | * | | | | | | Bug#55478 Row events wrongly apply on the temporary table of the same nameunknown2010-10-213-0/+98
| | | | * | | | | | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-2018-45/+53
| | | | * | | | | | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-209-37/+60
| | | | * | | | | | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-1912-49/+72
| | | | * | | | | | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-193-3/+10
| | | | * | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-191-4/+6
| | | | * | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-191-3/+6
| | | | * | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-194-13/+35
| | | | * | | | | | | Bug #46941 crash with lower_case_table_names=2 and foreign key Magne Mahre2010-10-195-1/+71
| | | | * | | | | | | Bug #57274 SET GLOBAL debug crashes on Solaris in embedded server modeJon Olav Hauglid2010-10-191-0/+1
| | | | * | | | | | | Bug#52172 post-push fix: init auto-variable to NULLTor Didriksen2010-10-191-1/+1