| Commit message (Expand) | Author | Age | Files | Lines |
* | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 3 | -4/+3 |
* | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 15 | -294/+628 |
|\ |
|
| * | Bug#51832 mysql_upgrade failing on performance_schema tables in mysql-trunk | Alexander Nozdrin | 2010-03-09 | 1 | -1/+1 |
| * | A follow-up on WL#5154 and WL#5182: remove forgotten options. | Alexander Nozdrin | 2010-03-03 | 2 | -5/+0 |
| * | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 10 | -142/+165 |
| |\ |
|
| * | | Bug#10143 Perror not showing error description | Marc Alff | 2010-02-23 | 1 | -1/+2 |
| * | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-22 | 2 | -43/+47 |
| |\ \ |
|
| | * \ | merge | Vladislav Vaintroub | 2010-02-20 | 1 | -61/+230 |
| | |\ \ |
|
| | * \ \ | merge | Vladislav Vaintroub | 2010-02-16 | 1 | -1/+2 |
| | |\ \ \ |
|
| | * \ \ \ | merge | Vladislav Vaintroub | 2010-02-06 | 2 | -5/+6 |
| | |\ \ \ \ |
|
| | * | | | | | Correctly cast the result of malloc. | Vladislav Vaintroub | 2010-01-20 | 1 | -1/+1 |
| | * | | | | | Fix compatibility problem with older HPUX | Vladislav Vaintroub | 2010-01-19 | 1 | -1/+1 |
| | * | | | | | Fix various compiler/OS compatibility errors | Vladislav Vaintroub | 2010-01-19 | 1 | -1/+16 |
| | * | | | | | merge | Vladislav Vaintroub | 2010-01-18 | 2 | -2/+3 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-01-13 | 1 | -12/+16 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2010-01-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-25 | 4 | -78/+15 |
| | |\ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-19 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-19 | 3 | -11/+45 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are insta... | Vladislav Vaintroub | 2009-12-17 | 1 | -24/+10 |
| | * | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-16 | 2 | -19/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined... | Vladislav Vaintroub | 2009-12-12 | 1 | -2/+1 |
| | * | | | | | | | | | | | | merge | Vladislav Vaintroub | 2009-12-11 | 10 | -12/+28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-12-02 | 1 | -1/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-11-25 | 6 | -24/+24 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge | Vladislav Vaintroub | 2009-11-20 | 8 | -30/+430 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | automerge | Vladislav Vaintroub | 2009-11-13 | 3 | -27/+112 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | WL#5161 : Cross-platform build with CMake | Vladislav Vaintroub | 2009-11-09 | 1 | -32/+40 |
| * | | | | | | | | | | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-20 | 2 | -62/+232 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | upmerge 51135 | Bjorn Munch | 2010-02-18 | 1 | -11/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | upmerge 51135 | Bjorn Munch | 2010-02-18 | 1 | -10/+21 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | new merge from next-mr | Bjorn Munch | 2010-02-16 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 2 | -5/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 2 | -2/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -12/+16 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 2 | -4/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 2 | -74/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 5 | -30/+48 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-15 | 10 | -12/+28 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -1/+2 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | upmerge 31602,47389,50618 | Bjorn Munch | 2010-02-11 | 1 | -5/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | upmerge 31602,47389,50618 | Bjorn Munch | 2010-02-11 | 1 | -5/+17 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge from mysql-trunk | Bjorn Munch | 2010-02-07 | 5 | -19/+55 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge from next-mr | Bjorn Munch | 2010-02-07 | 2 | -5/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | upmerge 39774 | Bjorn Munch | 2010-02-04 | 1 | -1/+78 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | upmerge 39774 | Bjorn Munch | 2010-02-04 | 1 | -1/+78 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | Bug #39774 mysql-test-run's remove_file can't use wildcards, this should be d... | Bjorn Munch | 2010-02-04 | 1 | -1/+78 |
| | * | | | | | | | | | | | | | | | | | | | | | | | upmerge 43005,48888,49837,49878,50471 | Bjorn Munch | 2010-01-20 | 1 | -4/+33 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / / / |
|