Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Backport of revno: 2617.69.40 | Jon Olav Hauglid | 2009-12-09 | 1 | -2/+2 |
* | Backport of: | Konstantin Osipov | 2009-12-08 | 1 | -8/+2 |
* | Backport of: | Konstantin Osipov | 2009-12-04 | 1 | -8/+8 |
* | Backport of: | Konstantin Osipov | 2009-12-04 | 1 | -7/+8 |
* | Merge next-mr -> next-4284 | Konstantin Osipov | 2009-12-03 | 1 | -3/+0 |
|\ | |||||
| * | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -3/+0 |
| |\ | |||||
| | * | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -18/+22 |
| | |\ | |||||
| | * | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -3/+0 |
* | | | | Backport of: | Konstantin Osipov | 2009-12-02 | 1 | -4/+5 |
* | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -3/+3 |
* | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -3/+3 |
* | | | | Backport of: | Konstantin Osipov | 2009-12-01 | 1 | -6/+7 |
* | | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -1/+6 |
|/ / / | |||||
* | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -4/+4 |
* | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -4/+0 |
|\ \ \ | |||||
| * | | | Backport of Bug#15192 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -3/+0 |
| * | | | Backport of Bug#36649 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -1/+0 |
* | | | | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'. | Alexander Nozdrin | 2009-11-05 | 1 | -1/+1 |
* | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -14/+17 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -14/+17 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug #47412: Valgrind warnings / user can read uninitalized memory using | Georgi Kodinov | 2009-10-26 | 1 | -14/+17 |
* | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -4/+5 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -4/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -4/+5 |
* | | | | Backport a patch from 6.0: | Alexander Nozdrin | 2009-11-02 | 1 | -1/+1 |
* | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * \ \ \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| * | | | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to Betony | Sergey Glukhov | 2009-10-23 | 1 | -1/+0 |
* | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -0/+1 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -0/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay log | Luis Soares | 2009-09-29 | 1 | -0/+1 |
| | | |/ | | |/| | |||||
* | | | | Merge with next-mr-runtime. | Konstantin Osipov | 2009-10-22 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Automerge | Kristofer Pettersson | 2009-10-19 | 1 | -17/+22 |
| |\ \ \ \ | |||||
| * | | | | | Bug#27145 EXTRA_ACL troubles | Kristofer Pettersson | 2009-10-19 | 1 | -2/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -4/+15 |
| |/ / / |/| | | | |||||
* | | | | Backport of: | Konstantin Osipov | 2009-10-16 | 1 | -4/+8 |
* | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -8/+9 |
* | | | | Bug #44651 "have_community_features" variable should be renamed | Jon Olav Hauglid | 2009-10-09 | 1 | -5/+5 |
|/ / / | |||||
* | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -9/+24 |
| |/ |/| | |||||
* | | merge of 5.1-main into mysql-trunk. | Guilhem Bichot | 2009-08-12 | 1 | -6/+4 |
|\ \ | |/ | |||||
| * | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ... | Kristofer Pettersson | 2009-07-29 | 1 | -2/+2 |
| * | Merge from 5.0 | Gleb Shchepa | 2009-07-24 | 1 | -4/+2 |
| |\ | |||||
| | * | Bug #38816: kill + flush tables with read lock + stored | Gleb Shchepa | 2009-07-24 | 1 | -4/+2 |
| | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -2/+31 |
| | |\ | |||||
| | | * | Pull 5.1 treatment of community features into 5.0. | Chad MILLER | 2009-05-05 | 1 | -5/+5 |
| | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -8/+13 |
| | | |\ | |||||
| | | * \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -3/+10 |
| | | |\ \ | |||||
| | | * \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -0/+4 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -1/+7 |
| | | |\ \ \ \ |