summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2009-12-198-13/+47
|\
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-196-3/+23
| |\
| | * Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-175-24/+26
| | |\
| | * \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-172-1/+4
| | |\ \
| | | * \ Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-172-1/+4
| | | |\ \
| | | | * \ merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-172-1/+4
| | | | |\ \
| | | | | * | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-172-0/+7
| | * | | | | Auto-merge from mysql-next-mr-summit0.3.Alexander Nozdrin2009-12-165-33/+129
| | |\ \ \ \ \
| | * \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-164-2/+19
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-163-1/+18
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-123-1/+18
| | | * | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-4/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-1/+1
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Merge from 5.0Staale Smedseng2009-12-061-1/+1
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | |
| * | | | | | | | Increase probability of correct atomics implementation by choosing stable imp...Mikael Ronstrom2009-12-191-0/+1
| * | | | | | | | Make choices of atomic implementation based on highest stabilityMikael Ronstrom2009-12-191-9/+21
| * | | | | | | | Fixed Solaris Atomics build issuesMikael Ronstrom2009-12-181-1/+2
| * | | | | | | | Added extra checks of 64-bit atomic support on GCC and Solaris, also added 64...Mikael Ronstrom2009-12-181-1/+45
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Fix missing 64 bit Solaris atomic prototypesVladislav Vaintroub2009-12-191-0/+44
* | | | | | | | mergeVladislav Vaintroub2009-12-1910-55/+155
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-175-33/+129
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge to latest mysql-next-mrMikael Ronstrom2009-12-164-26/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Fix for Windows atomicsMikael Ronstrom2009-12-161-15/+19
| | * | | | | | Fixed complex gcc assembler issues with 64-bit operations on 32-bit platforms...Mikael Ronstrom2009-12-151-18/+47
| | * | | | | | Include windows.h in atomics framework for windowsMikael Ronstrom2009-12-151-0/+1
| | * | | | | | Fixed 64-bit atomics on Win x86 and removed support for 8 and 16-bit atomic o...Mikael Ronstrom2009-12-152-16/+4
| | * | | | | | Fixed atomic instruction headers for Windows and x86-gccMikael Ronstrom2009-12-152-4/+34
| | * | | | | | MergeMikael Ronstrom2009-12-1418-43/+3842
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merged in WL#5138Mikael Ronstrom2009-11-273-8/+41
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-2711-61/+477
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-2010-215/+425
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-125-16/+63
| | | | * | | | | | | | Moved atomics from 6.0 codebase to prepare for using atomic increments in pla...Mikael Ronstrom2009-10-097-203/+388
| | * | | | | | | | | | Merge WL#5137 to mysql-next-mrMikael Ronstrom2009-11-271-0/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | WL#5137, Remove hash calculation from LOCK_open in open_tableMikael Ronstrom2009-11-201-0/+11
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Review comments for LOCK_open patchMikael Ronstrom2009-11-101-4/+6
| | | | * | | | | | | | A minor change to MySQL's hash where calculation of hash can be done separate...Mikael Ronstrom2009-10-091-0/+9
| | | | |/ / / / / / /
| * | | | | | | | | | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-164-26/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge cleanupMarc Alff2009-12-111-2/+0
| * | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-095-22/+26
* | | | | | | | | | | mergeVladislav Vaintroub2009-12-164-26/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-4/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-4/+0
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-123-22/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | / / / / / / | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1144-488/+697
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Automerge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-11-262-20/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-242-20/+0
| | * | | | | | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Bug#47571 : idle named pipe connection is unkillableVladislav Vaintroub2009-11-201-2/+2