summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-1/+4
|\
| * Backporting revision from mysql-6.0-codebase-bugfixing.Alexander Nozdrin2010-01-111-1/+4
* | Merge next-mr -> next-4284.Konstantin Osipov2010-02-0320-282/+139
|\ \ | |/
| * Manual merge of WL#4738 from mysql-next-mr: Alexey Kopytov2009-12-2820-282/+139
| |\
| | * mergedSergei Golubchik2009-12-241-1/+1
| | |\
| | * | fix atomic/solaris.h to conformSergei Golubchik2009-12-233-226/+32
| | * | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-2217-56/+107
* | | | Merge next-mr -> next-4284. Konstantin Osipov2010-02-023-5/+36
|\ \ \ \ | |/ / /
| * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-252-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-221-1/+1
| | |\ \ | | | |/
| | | * Fix inconsistently defined THR_LOCK_myisam_mmapVladislav Vaintroub2009-12-201-1/+1
| | * | Force use of c-register in CAS instruction on x86-32 bit architecture, b-regi...Mikael Ronstrom2009-12-211-1/+1
| | |/
| * | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-221-3/+34
| |/
* | Merge next-mr -> next-4284.Konstantin Osipov2010-02-029-16/+96
|\ \ | |/
| * Yet one more fix for Solaris atomics in buildsMikael Ronstrom2009-12-191-1/+1
| * Fixed Solaris build issuesMikael Ronstrom2009-12-191-10/+4
| * Merged in latest mysql-next-mrMikael Ronstrom2009-12-196-3/+23
| |\
| | * 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
| | | | | |\ \ \ \ \ | | | | | | | |_|/ / | | | | | | |/| | |
| * | | | | | | | | Fixed solaris buildsMikael Ronstrom2009-12-191-0/+8
| |/ / / / / / / /
| * | | | | | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-0214-83/+157
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
View Lorry Controller Status