summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge of mysql-5.5 into mysql-5.5-wl1054Georgi Kodinov2010-09-20503-6887/+25241
|\
| * Merge 5.5.6-rc to the main tree.Joerg Bruehe2010-09-192-8/+22
| |\
| | * Bug#52419: x86 assembly based atomic CAS causes test failuresDavi Arnaut2010-09-171-8/+10
| | * Selective transfer of a bugfix patch into 5.5.6-rc.Joerg Bruehe2010-09-131-0/+12
| * | Automerge (most) changes of the 5.5.6-rc release build to main 5.5.Joerg Bruehe2010-09-1031-48/+388
| |\ \ | | |/
| | * Fix bug#56574:Joerg Bruehe2010-09-071-0/+1
| | * A temporary workaround for bug #56405 "Deadlock in theDmitry Lenev2010-09-065-11/+78
| | * Fix bug#56547 mysql client interprets commands in commentsJoerg Bruehe2010-09-061-1/+4
| | * Check the build mechanisms: Do they support a "-rc" suffix?Joerg Bruehe2010-09-021-1/+1
| | * Cherry-picking patch for Bug#55846.Alexander Nozdrin2010-08-313-3/+6
| | * Cherry-picking patch for Bug#55980.Alexander Nozdrin2010-08-3110-9/+178
| | * Cherry-picking patch for Bug#56137 from mysql-5.5-runtime.Alexander Nozdrin2010-08-313-0/+50
| | * Cherry-pick patch for Bug#56120 from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-313-4/+28
| | * Bug#56387 Create initial database in the proper locationDaniel Fischer2010-08-311-2/+1
| | * Bug#55077: Assertion failed: width > 0 && to != ((void *)0),Alexey Kopytov2010-08-256-21/+69
| * | Auto-merge from mysql-5.5-stage.Alexander Nozdrin2010-09-0155-249/+985
| |\ \
| | * \ Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-315-38/+39
| | |\ \
| | | * \ automerge 5.1-bugteam --> 5.5-merge (bug 53034)Gleb Shchepa2010-08-313-1/+39
| | | |\ \
| | | | * | Bug #53034: Multiple-table DELETE statements not acceptingGleb Shchepa2010-08-313-1/+39
| | | * | | Follow-up for Bug#29751: FLUSH LOGS doesn't create -old file,Dmitry Shulga2010-08-302-37/+0
| | * | | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-30417-6228/+23621
| | |\ \ \ \ | | | |/ / /
| | | * | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-30393-6115/+23121
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Auto-merge from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-3067-162/+976
| |\ \ \ \ \
| | * | | | | Update result files.Alexander Nozdrin2010-08-282-6/+6
| | * | | | | local mergeMarc Alff2010-08-2748-113/+903
| | |\ \ \ \ \
| | | * \ \ \ \ Merge fix for BUG52821 to 5.5-bugfixing.Sergey Vojtovich2010-08-275-57/+257
| | | |\ \ \ \ \
| | | | * | | | | BUG#52821 - plugin_ftparser.h and plugin_audit.h areSergey Vojtovich2010-08-275-57/+257
| | | * | | | | | local mergeMarc Alff2010-08-2630-56/+480
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug# 53874 "SETUP_INSTRUMENTS.TIMED='NO' should not change TIMER_WAITChristopher Powers2010-08-262-19/+72
| | | | * | | | | | local mergeMarc Alff2010-08-2625-142/+232
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Bug#42511 mysqld: ctype-ucs2.c:2044: my_strnncollsp_utf32: Assertion (tlen % ...Alexander Barkov2010-08-263-6/+29
| | | | | * | | | | | mysqlhotcopy tests fixed.Alexey Botchkov2010-08-251-3/+2
| | | | | * | | | | | merge mysql-5.5-bugfixing (local) --> mysql-5.5-bugfixingAlfranio Correia2010-08-256-12/+12
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Post-fix push for BUG#53452.Alfranio Correia2010-08-256-12/+12
| | | | | |/ / / / / /
| | | | | * | | | | | merging.Alexey Botchkov2010-08-250-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Re-commit patch for Bug#56120.Alexander Nozdrin2010-08-253-4/+28
| | | | | * | | | | | | mysql.test fixed.Alexey Botchkov2010-08-254-9/+20
| | | | * | | | | | | | Implemented code review commentsMarc Alff2010-08-261-28/+11
| | | | * | | | | | | | Bug#55873 short startup options do not work in 5.5Marc Alff2010-08-2514-7/+362
| | | * | | | | | | | | Bug#52312 lost Handler_read_last status variableMarc Alff2010-08-2513-0/+166
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Bug#55576 Two perfschema tests failed on mysql-next-mr-innodb PB2 testsMarc Alff2010-08-2414-39/+39
| | |/ / / / / / / /
| * | | | | | | | | Raise version number after cloning 5.5.6-m3unknown2010-08-251-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-2521-15/+209
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Auto-merge from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-25351-5971/+22163
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Revert patch for Bug#56120 temporarily.Alexander Nozdrin2010-08-253-28/+4
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Auto-merged.Evgeny Potemkin2010-08-2420-137/+685
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fixed --ps-protocol failures of test for bug#54332 "DeadlockDmitry Lenev2010-08-242-0/+7
| | | * | | | | | | Follow-up to Bug #54332 Deadlock with two connections doingJon Olav Hauglid2010-08-241-33/+55
| | | * | | | | | | merge mysql-5.5-bugfixing (local) --> mysql-5.5-bugfixingAlfranio Correia2010-08-243-72/+73
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Post-fix push for BUG#53452.Alfranio Correia2010-08-233-72/+73
| | | | | |/ / / / / | | | | |/| | | | |