| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | | * | | | | | | | | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | upmerge 43005,48888,49837,49878,50471 | Bjorn Munch | 2010-01-20 | 1 | -4/+33 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | merge from next-mr | Bjorn Munch | 2010-01-19 | 4 | -15/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | upmerge 49269 amendment | Bjorn Munch | 2010-01-07 | 1 | -4/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | upmerge 49269 amendment | Bjorn Munch | 2010-01-07 | 1 | -4/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | upmerge 49269 amendment | Bjorn Munch | 2010-01-06 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | upmerge 49269 amendment | Bjorn Munch | 2010-01-06 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge 48863,49269,49345,49672,49761 | Bjorn Munch | 2010-01-06 | 1 | -4/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | merge 48863,49269,49345,49672,49761 | Bjorn Munch | 2010-01-06 | 1 | -4/+36 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge from trunk | Bjorn Munch | 2009-12-21 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge from trunk | Bjorn Munch | 2009-12-16 | 16 | -289/+308 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge from mysql-next-mr | Bjorn Munch | 2010-01-04 | 4 | -78/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge from next-mr | Bjorn Munch | 2009-12-21 | 4 | -11/+49 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge from next-mr | Bjorn Munch | 2009-12-16 | 15 | -329/+784 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge 48250, 48918, 49096 | Bjorn Munch | 2009-11-26 | 1 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upmerge 35543,48367,48671,48806,48808 | Bjorn Munch | 2009-11-19 | 1 | -32/+41 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#5182 Remove more deprecated 4.1/5.0 features | Magne Mahre | 2010-02-17 | 3 | -13/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-02-17 | 4 | -32/+7 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-18 | 6 | -93/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 2 | -13/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backporting revision from mysql-6.0-codebase-bugfixing. | Alexander Nozdrin | 2010-01-11 | 1 | -8/+12 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backporting revision from mysql-6.0-codebase-bugfixing. | Alexander Nozdrin | 2010-01-11 | 1 | -10/+10 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -1/+1 |
| | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual merge from next-mr. | | 2010-01-12 | 4 | -78/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual merge of WL#4738 from mysql-next-mr: | Alexey Kopytov | 2009-12-28 | 2 | -4/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 2 | -4/+7 |
| | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 2 | -74/+8 |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 2 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 2 | -9/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 2 | -2/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 2 | -2/+3 |