Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge backport of WL#3771 with mysql-next-mr. | Sergey Vojtovich | 2010-01-19 | 2 | -3/+4 |
|\ | |||||
| * | Merge backport of WL#3771 with mysql-next-mr. | Sergey Vojtovich | 2010-01-19 | 2 | -3/+4 |
| |\ | |||||
| | * | Backport from 6.0-codebase. | Sergey Vojtovich | 2009-12-15 | 2 | -3/+4 |
* | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 2 | -3/+15 |
|\ \ \ | |/ / | |||||
| * | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-11 | 1 | -1/+13 |
| |\ \ | |||||
| | * | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -1/+13 |
| * | | | fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE f... | Guilhem Bichot | 2010-01-06 | 1 | -2/+2 |
| |/ / | |||||
* | | | Manual merge from next-mr. | unknown | 2010-01-12 | 3 | -4/+8 |
|\ \ \ | |/ / | |||||
| * | | merged | Sergei Golubchik | 2009-12-24 | 1 | -0/+1 |
| |\ \ | |||||
| * | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 3 | -4/+8 |
* | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Alfranio Correia | 2009-12-17 | 1 | -1/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merging with mysql-5.1-rep+2 | Mats Kindahl | 2009-12-15 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | WL#5151: Conversion between different types when replicating | Mats Kindahl | 2009-12-14 | 1 | -1/+1 |
| * | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 4 | -2/+17 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Auto-merge from mysql-trunk-bugfixing. | Alexander Nozdrin | 2009-12-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Fix build error with CMake 2.8 (mysql_stmt_next_result not exported | Vladislav Vaintroub | 2009-12-22 | 1 | -0/+1 |
* | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 7 | -59/+77 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Automerge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-11-26 | 1 | -1/+0 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an... | Davi Arnaut | 2009-11-24 | 1 | -1/+0 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Backport of Bug#47304 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -0/+1 |
* | | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioning | Mattias Jonsson | 2009-11-20 | 1 | -1/+0 |
|/ / / / / / | |||||
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -0/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Automerge. | Davi Arnaut | 2009-11-02 | 1 | -0/+1 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Bug#41728: Dropped symbol but no soname change | Davi Arnaut | 2009-09-29 | 1 | -0/+1 |
* | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 2 | -2/+3 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 2 | -2/+3 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Backporting WL#4398 WL#1720 | He Zhenxing | 2009-09-26 | 2 | -1/+3 |
* | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 4 | -3/+26 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 1 | -1/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 1 | -1/+9 |
| * | | | | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-19 | 1 | -2/+11 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-19 | 1 | -2/+11 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Bug #47795 CMake, storage engine name different from directory name | Magnus BlÄudd | 2009-10-08 | 1 | -2/+11 |
| * | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 4 | -0/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-13 | 4 | -0/+6 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | auto-merge | Ingo Struewing | 2009-10-02 | 1 | -0/+3 |
| | | |\ \ \ | |||||
| | | | * \ \ | merging | Alexey Botchkov | 2009-09-29 | 5 | -69/+41 |
| | | | |\ \ \ | |||||
| | | | * | | | | Bug#43733 Select on processlist let the embedded server crash (concurren... | Alexey Botchkov | 2009-06-04 | 1 | -0/+3 |
| | | * | | | | | auto-merge | Ingo Struewing | 2009-10-01 | 2 | -0/+2 |
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||||
| | | | * | | | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 2 | -0/+2 |
| | | | | |/ / | | | | |/| | | |||||
| | | * | | | | merge | Georgi Kodinov | 2009-09-25 | 1 | -0/+1 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/| | |||||
| | | | * | | Bug #45159 : some tests in suite "jp" fail in embedded server (use LOAD DATA) | Georgi Kodinov | 2009-09-11 | 1 | -0/+1 |
* | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -5/+5 |
* | | | | | | Bug #44651 "have_community_features" variable should be renamed | Jon Olav Hauglid | 2009-10-09 | 1 | -2/+2 |