Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -6/+3 |
|\ | |||||
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-25 | 1 | -6/+3 |
| |\ | |||||
| | * | merge | Georgi Kodinov | 2009-12-24 | 1 | -6/+3 |
| | |\ | |||||
| | | * | Bug #48866: mysql.test fails under Fedora 12 | Georgi Kodinov | 2009-12-16 | 1 | -6/+3 |
* | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-18 | 21 | -286/+183 |
|\ \ \ \ | |||||
| * \ \ \ | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -1/+4 |
| |\ \ \ \ | |||||
| | * | | | | Backporting revision from mysql-6.0-codebase-bugfixing. | Alexander Nozdrin | 2010-01-11 | 1 | -1/+4 |
| * | | | | | Manual merge from next-mr. | 2010-01-12 | 20 | -285/+173 | |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Manual merge of WL#4738 from mysql-next-mr: | Alexey Kopytov | 2009-12-28 | 20 | -282/+139 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | merged | Sergei Golubchik | 2009-12-24 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * | | | | | fix atomic/solaris.h to conform | Sergei Golubchik | 2009-12-23 | 3 | -226/+32 |
| | | * | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 17 | -56/+107 |
| | * | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-25 | 2 | -2/+2 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | * | | | | | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 1 | -3/+34 |
| * | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 3 | -22/+2 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | WL#5142 FLUSH LOGS should take optional arguments for which log(s) to flush | 2009-12-03 | 1 | -0/+6 | |
| | * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 4 | -2/+30 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 3 | -14/+62 |
| | |\ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | Bug#43397 mysql headers redefine pthread_mutex_init | Staale Smedseng | 2009-12-20 | 1 | -1/+1 |
* | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix inconsistently defined THR_LOCK_myisam_mmap | Vladislav Vaintroub | 2009-12-20 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Force use of c-register in CAS instruction on x86-32 bit architecture, b-regi... | Mikael Ronstrom | 2009-12-21 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Yet one more fix for Solaris atomics in builds | Mikael Ronstrom | 2009-12-19 | 1 | -1/+1 |
* | | | | | | | | Fixed Solaris build issues | Mikael Ronstrom | 2009-12-19 | 1 | -10/+4 |
* | | | | | | | | Merged in latest mysql-next-mr | Mikael Ronstrom | 2009-12-19 | 6 | -3/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-19 | 6 | -3/+23 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 5 | -24/+26 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 2 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 2 | -1/+4 |
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | |||||
| | | | * | | | | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 2 | -1/+4 |
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ | | | | | |/| | | | | | |||||
| | | | | * | | | | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 2 | -0/+7 |
| | * | | | | | | | | | Auto-merge from mysql-next-mr-summit0.3. | Alexander Nozdrin | 2009-12-16 | 5 | -33/+129 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 4 | -2/+19 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 3 | -1/+18 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 3 | -1/+18 |
| | | * | | | | | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 1 | -4/+0 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | Merge from 5.0 | Staale Smedseng | 2009-12-06 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / | | | | | |/| | | | | | / | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | | |||||
* | | | | | | | | | | | | Fixed solaris builds | Mikael Ronstrom | 2009-12-19 | 1 | -0/+8 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Increase probability of correct atomics implementation by choosing stable imp... | Mikael Ronstrom | 2009-12-19 | 1 | -0/+1 |
* | | | | | | | | | | | Make choices of atomic implementation based on highest stability | Mikael Ronstrom | 2009-12-19 | 1 | -9/+21 |
* | | | | | | | | | | | Fixed Solaris Atomics build issues | Mikael Ronstrom | 2009-12-18 | 1 | -1/+2 |
* | | | | | | | | | | | Added extra checks of 64-bit atomic support on GCC and Solaris, also added 64... | Mikael Ronstrom | 2009-12-18 | 1 | -1/+45 |
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc | Marc Alff | 2009-12-17 | 5 | -33/+129 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge to latest mysql-next-mr | Mikael Ronstrom | 2009-12-16 | 4 | -26/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| * | | | | | | | | | Fix for Windows atomics | Mikael Ronstrom | 2009-12-16 | 1 | -15/+19 |
| * | | | | | | | | | Fixed complex gcc assembler issues with 64-bit operations on 32-bit platforms... | Mikael Ronstrom | 2009-12-15 | 1 | -18/+47 |