Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-11 | 1 | -0/+20 |
|\ | |||||
| * | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -0/+20 |
* | | Fix for BUG#50081 "Tests: mysqld--help-notwin fails with --parallel": | Guilhem Bichot | 2010-01-06 | 1 | -1/+2 |
|/ | |||||
* | don't show --ssl* option if ssl is not compiled in | Sergei Golubchik | 2009-12-25 | 1 | -1/+1 |
* | slightly more complete mysqld--help test | Sergei Golubchik | 2009-12-24 | 1 | -5/+6 |
* | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 7 | -8/+58 |
* | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-19 | 1 | -1/+1 |
|\ | |||||
| * | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -1/+1 |
| |\ | |||||
| | * | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge from 5.0-bugteam | He Zhenxing | 2009-12-10 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Post fix for bug#45520 | He Zhenxing | 2009-12-10 | 1 | -1/+1 |
* | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-16 | 1 | -0/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -0/+8 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 17 | -13/+195 |
| | |\ \ \ | |||||
| | * \ \ \ | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -0/+8 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | auto-merge bzr bundle from bug report into latest mysql-5.1-bugteam. | Luis Soares | 2009-11-06 | 1 | -0/+9 |
| | | |\ \ \ | |||||
| | | | * | | | BUG#47743: rpl.rpl_log_pos fails sporadically | Luis Soares | 2009-11-04 | 1 | -0/+9 |
* | | | | | | | merge | Mattias Jonsson | 2009-12-15 | 2 | -0/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Bug#49369: No testcase for key caches on partitions | Mattias Jonsson | 2009-12-03 | 2 | -0/+15 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-03 | 6 | -0/+113 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 5 | -28/+145 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | No more socket and no more diffs in result files. | Horst.Hunger | 2009-11-27 | 2 | -8/+8 |
| * | | | | | | | Improvements to reduce the output for better reading and more stability. | Horst.Hunger | 2009-11-26 | 3 | -10/+14 |
| * | | | | | | | Reviewed patch of QA results for WL#798. | Horst.Hunger | 2009-11-23 | 6 | -0/+109 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 5 | -28/+145 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 5 | -28/+145 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | 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/+4 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Backport for WL#4416 | Serge Kozlov | 2009-11-27 | 1 | -0/+41 |
| | * | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 3 | -7/+51 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 3 | -7/+51 |
| | * | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 12 | -17/+40 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Auto merge from 5.1-rep+2-delivery1 | He Zhenxing | 2009-10-27 | 1 | -0/+7 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Bug#13963 SHOW SLAVE HOSTS is unreliable | unknown | 2009-10-20 | 1 | -21/+53 |
* | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return result | He Zhenxing | 2009-11-21 | 1 | -0/+22 |
|/ / / / / / / / | |||||
* | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-10-27 | 1 | -0/+4 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Bug#41049 does syntax "grant" case insensitive? | Sergey Glukhov | 2009-10-27 | 1 | -0/+4 |
| | * | | | | | merge from 5.1 main | Bjorn Munch | 2009-10-16 | 10 | -14/+26 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| * | | | | | | new merge from trunk | Bjorn Munch | 2009-10-22 | 6 | -2/+16 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Bug#33637 SHOW PROCEDURE CODE/SHOW FUNCTION CODE sp_name gives a syntax error. | Marc Alff | 2009-10-29 | 1 | -0/+4 |
* | | | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 11 | -6/+128 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 9 | -6/+108 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | automerge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge. | Luis Soares | 2009-10-25 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | Auto merge 5.1-rep-semisync to 5.1-rep+2-delivery1 | He Zhenxing | 2009-10-23 | 1 | -0/+7 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | | * | | | | | | Skip semisync test if the plugin-dir is not set to semisync plugin dir | He Zhenxing | 2009-10-23 | 1 | -0/+7 |
| | * | | | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 9 | -6/+101 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | Manual merge semi-sync to 5.1-rep+2 | He Zhenxing | 2009-10-03 | 1 | -0/+15 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | |||||
| | | | * | | | | | | Back porting the test case for semi-sync | He Zhenxing | 2009-09-30 | 1 | -0/+15 |