Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Auto-merge from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2010-02-23 | 13 | -29/+359 |
|\ | |||||
| * | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-21 | 2 | -0/+9 |
| |\ | |||||
| | * | Patch for WL#3736: Extended Table, Column and Index Comments. | Alexander Nozdrin | 2010-02-20 | 2 | -0/+9 |
| * | | merge | Vladislav Vaintroub | 2010-02-18 | 1 | -0/+17 |
| |\ \ | | |/ | |||||
| | * | Re-adding 'include/probes_mysql_nodtrace.h' removed by accident | Alexander Nozdrin | 2010-02-17 | 1 | -0/+129 |
| | * | Merging from mysql-next-mr | Alexander Barkov | 2010-02-17 | 6 | -137/+76 |
| | |\ | |||||
| | * | | Post-fix for WL#3090. | Alexander Barkov | 2010-02-16 | 1 | -1/+1 |
| | * | | WL#3090 Japanese Character Set adjustments | Alexander Barkov | 2010-02-15 | 1 | -0/+17 |
| * | | | merge | Vladislav Vaintroub | 2010-02-16 | 5 | -8/+76 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | merge | Vladislav Vaintroub | 2010-02-13 | 2 | -1/+8 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | merge | Vladislav Vaintroub | 2010-02-06 | 3 | -8/+5 |
| |\ \ \ | |||||
| * | | | | prettification of package names and fix compile bug on OSX/ppc | Vladislav Vaintroub | 2010-01-28 | 1 | -1/+1 |
| * | | | | merge, add plugin/audit_null/CMakeLists.txt | Vladislav Vaintroub | 2010-01-26 | 6 | -205/+339 |
| |\ \ \ \ | |||||
| * | | | | | Fix failing sys_vars.plugin_dir_basic - treat both '/' and '\' as path separa... | Vladislav Vaintroub | 2010-01-24 | 1 | -0/+2 |
| * | | | | | Handle different installation layouts. | Vladislav Vaintroub | 2010-01-24 | 1 | -3/+2 |
| * | | | | | merge | Vladislav Vaintroub | 2010-01-22 | 1 | -3/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-01-18 | 1 | -0/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-01-13 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-25 | 20 | -284/+172 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix inconsistently defined THR_LOCK_myisam_mmap | Vladislav Vaintroub | 2009-12-20 | 1 | -1/+1 |
| * | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-20 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-19 | 8 | -13/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix missing 64 bit Solaris atomic prototypes | Vladislav Vaintroub | 2009-12-19 | 1 | -0/+44 |
| * | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-19 | 10 | -55/+155 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-16 | 4 | -26/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-10 | 3 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Fix my_atomic.h on Solaris, do not redefine macros already defined | Vladislav Vaintroub | 2009-12-05 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-04 | 15 | -34/+3833 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-11-30 | 2 | -0/+130 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-11-25 | 6 | -53/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-11-25 | 11 | -218/+712 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-11-20 | 3 | -10/+76 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | automerge | Vladislav Vaintroub | 2009-11-13 | 4 | -2/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | WL#5161 : Cross-platform build with CMake | Vladislav Vaintroub | 2009-11-09 | 8 | -29/+200 |
* | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warnings in my_atomic.h | Konstantin Osipov | 2010-02-19 | 2 | -3/+3 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-next-4284. | Alexander Nozdrin | 2010-02-15 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-15 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marc | Marc Alff | 2010-02-05 | 3 | -8/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marc | Marc Alff | 2010-01-27 | 5 | -205/+336 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Bug#44210 Performance schema: pool-of-threads threads instrumentation is missing | Marc Alff | 2010-01-26 | 2 | -1/+8 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Bug #45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-11 | 2 | -4/+48 |
* | | | | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 8 | -213/+341 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merging from 5.0-bugteam | Staale Smedseng | 2010-01-27 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-25 | 5 | -205/+336 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge backport of WL#3771 with mysql-next-mr. | Sergey Vojtovich | 2010-01-22 | 5 | -205/+336 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge backport of WL#3771 with mysql-next-mr. | Sergey Vojtovich | 2010-01-19 | 5 | -205/+336 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | |