Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -26/+29 |
|\ | |||||
| * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-02-09 | 1 | -89/+117 |
| |\ | |||||
| | * | Bug#49025: mysqld-debug: missing DBUG_RETURN or DBUG_VOID_RETURN macro in fun... | Davi Arnaut | 2010-02-05 | 1 | -5/+6 |
| | * | Recommit of Bug#49447. | Staale Smedseng | 2010-02-04 | 1 | -86/+113 |
| * | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-02-03 | 1 | -3/+9 |
| |\ \ | | |/ | |||||
| | * | Cleanup fix for WL#5154 that splits commands handling for | Magne Mahre | 2010-02-02 | 1 | -3/+9 |
| * | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -6/+36 |
| |\ \ | | |/ | |||||
| | * | WL#5182 Remove more deprecated 4.1/5.0 features | Magne Mahre | 2010-01-27 | 1 | -5/+35 |
| * | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -3/+26 |
| |\ \ | |||||
* | \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-22 | 1 | -3/+6 |
|\ \ \ \ | |||||
| * \ \ \ | merge | Vladislav Vaintroub | 2010-02-16 | 1 | -5/+10 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge | Vladislav Vaintroub | 2010-02-13 | 1 | -12/+13 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-02-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge, add plugin/audit_null/CMakeLists.txt | Vladislav Vaintroub | 2010-01-26 | 1 | -15/+22 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix failing sys_vars.plugin_dir_basic - treat both '/' and '\' as path separa... | Vladislav Vaintroub | 2010-01-24 | 1 | -1/+1 |
| * | | | | | | | | merge | Vladislav Vaintroub | 2010-01-22 | 1 | -1/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Cherrypick fix for -DWITH_SSL=system by Marc Alff (Bug#50513) | Vladislav Vaintroub | 2010-01-21 | 1 | -7/+14 |
| * | | | | | | | | | merge | Vladislav Vaintroub | 2010-01-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix for 32 bit Linux problem reported by Timothy | Vladislav Vaintroub | 2010-01-15 | 1 | -0/+3 |
| * | | | | | | | | | | merge | Vladislav Vaintroub | 2010-01-14 | 1 | -79/+86 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-01-13 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-01-11 | 1 | -195/+832 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-25 | 1 | -1965/+432 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-19 | 1 | -4/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-19 | 1 | -29/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-16 | 1 | -12/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-11 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Introduce a workaround for Solaris' inability to deal with dtrace in static ... | Vladislav Vaintroub | 2009-12-11 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-20 | 1 | -5/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -19/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -16/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284-merge. | Konstantin Osipov | 2010-02-04 | 1 | -81/+88 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -195/+831 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -1964/+366 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -1/+66 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -4/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -41/+82 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-15 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-08 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2009-12-03 | 1 | -145/+85 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -2/+3 |
* | | | | | | | | | | | | | | | | | | | | | WL#5182 Remove more deprecated 4.1/5.0 features | Magne Mahre | 2010-02-17 | 1 | -54/+2 |
* | | | | | | | | | | | | | | | | | | | | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-02-17 | 1 | -17/+0 |
* | | | | | | | | | | | | | | | | | | | | | Bug#48929 Error in Accept() if using many file descriptors | Magne Mahre | 2010-02-14 | 1 | -10/+54 |
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Merge mysql-next-mr-marc --> mysql-next-mr-bugfixing | Marc Alff | 2010-02-05 | 1 | -7/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marc | Marc Alff | 2010-02-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marc | Marc Alff | 2010-01-27 | 1 | -15/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | |