summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-0651-613/+1100
* Merge from mysql-5.5-bugteam to mysql-5.5-runtime.Jon Olav Hauglid2010-10-06137-1659/+8556
|\
| * mergeGeorgi Kodinov2010-10-052-14/+78
| |\
| | * mergeGeorgi Kodinov2010-10-052-14/+78
| | |\
| | | * Bug #56428: Replace copyright notice removed from SHA1 code (.h)Georgi Kodinov2010-10-051-2/+35
| | | * Bug #56427 : Replace copyright notice removed from SHA1 codeGeorgi Kodinov2010-10-051-12/+43
| * | | WL#1054: fixed a compilation warningGeorgi Kodinov2010-10-051-1/+1
| * | | fixed failing test casesGeorgi Kodinov2010-10-053-9/+28
| * | | megre 5.1-bugteam->5.5-bugteamGeorgi Kodinov2010-10-053-4/+11
| |\ \ \ | | |/ /
| | * | mergedGeorgi Kodinov2010-10-052-138/+136
| | * | merged 5.0-bugteam into 5.1-bugteamGeorgi Kodinov2010-10-052-3/+11
| | |\ \ | | | |/
| | | * Disable NDB tests to run by default.Georgi Kodinov2010-10-053-5/+14
| | | * mergeGeorgi Kodinov2010-10-050-0/+0
| | | |\
| | * | \ merged mysql-5.1 into mysql-5.1-bugteamGeorgi Kodinov2010-10-0548-133/+813
| | |\ \ \
| | | * \ \ Merge from mysql-5.1.51-releasekaren.langford@sun.com2010-09-28178-987/+3453
| | | |\ \ \
| | | * | | | Raise version number after cloning 5.1.51Georgi Kodinov2010-09-131-1/+1
| * | | | | | fix compile error - #if/#endif mismatchVladislav Vaintroub2010-10-051-0/+1
| * | | | | | More fixes after WL1054 push:Vladislav Vaintroub2010-10-041-0/+5
| * | | | | | Fix compile error on Windows after WL#1054 push.Vladislav Vaintroub2010-10-043-7/+8
| * | | | | | mergeGeorgi Kodinov2010-10-041-5/+4
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge 56267 into 5.5-bugteam.Joerg Bruehe2010-10-041-5/+4
| | |\ \ \ \ \ \
| | | * | | | | | Fix bug#56267:Joerg Bruehe2010-10-031-5/+4
| * | | | | | | | worklog 1054: Fixed test suite typosGeorgi Kodinov2010-10-041-1/+1
| * | | | | | | | Bug #56767: Make sure client plugins in 1054 are compatible with Georgi Kodinov2010-10-046-1/+54
| * | | | | | | | mergeGeorgi Kodinov2010-10-04341-27992/+10548
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | WL#1054: code style remarks fixed.Georgi Kodinov2010-09-205-309/+324
| * | | | | | | | merge of mysql-5.5 into mysql-5.5-wl1054Georgi Kodinov2010-09-20503-6887/+25241
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Bug #56798 : Wrong credentials assigned when using a proxy user.Georgi Kodinov2010-09-203-24/+121
| * | | | | | | | | merged mysql-5.5 into WL1054-5.5Georgi Kodinov2010-08-16148-2085/+1530
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug #55634, Bug#55635, Bug#55637, Bug#55638Georgi Kodinov2010-08-164-50/+54
| * | | | | | | | | | Fixed a build error on solaris sparc in the mysql-5.5-wl1054 treeGeorgi Kodinov2010-08-101-1/+1
| * | | | | | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-09127-1616/+8248
* | | | | | | | | | | Bug#56452 Assertion failed: thd->transaction.stmt.is_empty() || Magne Mahre2010-10-063-0/+36
* | | | | | | | | | | Bug #57002 Assert in upgrade_shared_lock_to_exclusive()Jon Olav Hauglid2010-10-063-4/+62
* | | | | | | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtime.Jon Olav Hauglid2010-10-04146-26288/+6243
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Bug#57210: remove pstackDavi Arnaut2010-10-0429-22401/+2
| * | | | | | | | | | Merge mysql-5.5-innodb -> mysql-5.5-bugteamVasil Dimov2010-10-040-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql-5.5-bugteam -> mysql-5.5-innodbVasil Dimov2010-10-0412-131/+631
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge mysql-5.5-innodb from bk-internal to my local treeVasil Dimov2010-10-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge Bug#56716 from 5.1Marko Mäkelä2010-10-043-36/+50
| * | | | | | | | | | | | mergeVladislav Vaintroub2010-10-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql-5.1-bugteam -> mysql-5.5-bugteamVasil Dimov2010-10-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-10-047-72/+105
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Bug#56716 InnoDB locks a record gap without locking the tableMarko Mäkelä2010-10-044-36/+55
| | | | * | | | | | | | | | | Bug#56716 InnoDB locks a record gap without locking the tableMarko Mäkelä2010-10-043-36/+50
| | | | * | | | | | | | | | | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-10-045-681/+681
| | | | |\ \ \ \ \ \ \ \ \ \ \
| * | | | \ \ \ \ \ \ \ \ \ \ \ merge2Vladislav Vaintroub2010-10-048-74/+201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | null upmergeBjorn Munch2010-10-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Small test fix after 56753Bjorn Munch2010-10-031-2/+2
| | | * | | | | | | | | | | | | merge from 5.1-mtrBjorn Munch2010-10-038-36/+149
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \