summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-6/+3
|\
| * Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-251-6/+3
| |\
| | * mergeGeorgi Kodinov2009-12-241-6/+3
| | |\
| | | * Bug #48866: mysql.test fails under Fedora 12Georgi Kodinov2009-12-161-6/+3
* | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-1821-286/+183
|\ \ \ \
| * \ \ \ merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-1/+4
| |\ \ \ \
| | * | | | Backporting revision from mysql-6.0-codebase-bugfixing.Alexander Nozdrin2010-01-111-1/+4
| * | | | | Manual merge from next-mr.2010-01-1220-285/+173
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
| | * | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-252-2/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-221-3/+34
| * | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-0/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-173-22/+2
| | |\ \ \ \ \ \
| | * | | | | | | WL#5142 FLUSH LOGS should take optional arguments for which log(s) to flush2009-12-031-0/+6
| | * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-304-2/+30
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-063-14/+62
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-231-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Bug#43397 mysql headers redefine pthread_mutex_init Staale Smedseng2009-12-201-1/+1
* | | | | | | | | | 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
|/ / / / / / / /
* | | | | | | | 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 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