Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 1 | -8/+8 |
|\ | |||||
| * | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc | Marc Alff | 2009-12-17 | 1 | -1/+4 |
| |\ | |||||
| * \ | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 1 | -35/+1 |
| |\ \ | |||||
| * | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -8/+8 |
* | | | | Auto-merge from mysql-next-mr-summit0.3. | Alexander Nozdrin | 2009-12-16 | 1 | -1/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge | Mikael Ronstrom | 2009-12-14 | 1 | -36/+7 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge WL#5138 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -11/+1 |
| |\ \ \ | |||||
| * | | | | WL#5138, Fixed according to code review comments from Davi | Mikael Ronstrom | 2009-11-24 | 1 | -1/+4 |
* | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Auto-merged. | Evgeny Potemkin | 2009-12-02 | 1 | -0/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug#48508: Crash on prepared statement re-execution. | Evgeny Potemkin | 2009-12-01 | 1 | -0/+2 |
* | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-10 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 1 | -0/+6 |
* | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-03 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0. | Alexander Nozdrin | 2009-11-25 | 1 | -1/+0 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -11/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -10/+0 |
| * | | | | | Backport of: | Konstantin Osipov | 2009-11-20 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Auto merge | He Zhenxing | 2009-11-21 | 1 | -36/+12 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 1 | -2/+12 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -2/+12 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Backport of Bug#15192 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -1/+5 |
| | | * | | | Backport of Bug#41860 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -2/+5 |
| | | * | | | Backport of Bug#10374 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -1/+4 |
| * | | | | | merge of Bug#33204 (backport) | Martin Hansson | 2009-11-20 | 1 | -62/+81 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Backport of Bug#33204 from mysql-pe to | Martin Hansson | 2009-11-10 | 1 | -34/+0 |
* | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return result | He Zhenxing | 2009-11-21 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-10 | 1 | -3/+19 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-05 | 1 | -57/+51 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | WL#4903 Plugin Service API part I | Sergei Golubchik | 2009-11-02 | 1 | -3/+19 |
| | |/ / / | |/| | | | |||||
* | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -0/+6 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | manual merge of 28141 | Tatiana A. Nurnberg | 2009-10-20 | 1 | -0/+6 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd... | Tatiana A. Nurnberg | 2009-10-19 | 1 | -0/+6 |
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+5 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+5 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -2/+5 |
* | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -21/+7 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -21/+7 |
| |\ \ \ \ | |||||
| | * \ \ \ | Manual merge semi-sync to 5.1-rep+2 | He Zhenxing | 2009-10-03 | 1 | -18/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Backporting WL#4398 WL#1720 | He Zhenxing | 2009-09-26 | 1 | -18/+3 |
| | * | | | | | WL#4828 and BUG#45747 | Alfranio Correia | 2009-09-29 | 1 | -3/+0 |
| | * | | | | | WL#5016: Fix header file include guards | Mats Kindahl | 2009-09-23 | 1 | -0/+4 |
| | |/ / / / | |||||
* | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -3/+39 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 1 | -1/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 1 | -0/+2 |
| | * | | | | | WL#1397 convert XML -> SQL | Alexander Barkov | 2009-10-12 | 1 | -1/+4 |
| * | | | | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-19 | 1 | -1/+26 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-19 | 1 | -1/+26 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | |