Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-17 | 1 | -28/+35 |
|\ | |||||
| * | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc | Marc Alff | 2009-12-17 | 1 | -1/+8 |
| |\ | |||||
| * \ | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc | Marc Alff | 2009-12-16 | 1 | -12/+39 |
| |\ \ | |||||
| * | | | Merge cleanup | Marc Alff | 2009-12-11 | 1 | -5/+5 |
| * | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc | Marc Alff | 2009-12-11 | 1 | -2/+3 |
| |\ \ \ | |||||
| * | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -27/+34 |
* | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 1 | -0/+5 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -0/+5 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -1/+6 |
* | | | | | | | | Auto-merge from mysql-next-mr-summit0.3. | Alexander Nozdrin | 2009-12-16 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge to latest mysql-next-mr | Mikael Ronstrom | 2009-12-16 | 1 | -12/+39 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge | Mikael Ronstrom | 2009-12-14 | 1 | -147/+88 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge WL#5138 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -29/+14 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | WL#5138, fixed review comments | Mikael Ronstrom | 2009-11-23 | 1 | -0/+3 |
| * | | | | | | | | WL#5138, reverted some review fixes | Mikael Ronstrom | 2009-11-20 | 1 | -1/+1 |
| * | | | | | | | | WL#5138, review fixes | Mikael Ronstrom | 2009-11-20 | 1 | -1/+1 |
| * | | | | | | | | WL#5138 merged to mysql-next-mr | Mikael Ronstrom | 2009-11-20 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t... | Mikael Ronstrom | 2009-10-12 | 1 | -1/+5 |
* | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 1 | -1/+0 |
| * | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Bug #48742 Replication: incorrect help text for --init-slave | unknown | 2009-12-11 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | | * | | | | | | Bug #48742 Replication: incorrect help text for --init-slave | unknown | 2009-12-11 | 1 | -1/+2 |
| | * | | | | | | | BUG#45292 orphan binary log created when starting server twice | Alfranio Correia | 2009-12-04 | 1 | -2/+2 |
* | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -12/+39 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -196/+211 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -5/+11 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Bug#47571 : idle named pipe connection is unkillable | Vladislav Vaintroub | 2009-11-20 | 1 | -5/+11 |
| * | | | | | | | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -7/+28 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | merge | Georgi Kodinov | 2009-11-10 | 1 | -7/+7 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Bug #32167: another privilege bypass with DATA/INDEX DIRECTORY | Georgi Kodinov | 2009-11-03 | 1 | -7/+7 |
| | | | |/ / / / | | | |/| | | | | |||||
| | * | | | | | | Bug #34739 unexpected binlog file name when --log-bin is set to a directory ... | unknown | 2009-11-05 | 1 | -0/+21 |
* | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-03 | 1 | -40/+76 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 1 | -105/+9 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | A patch for Bug#48915 (After having switched off the ipv6 support in OS, | Alexander Nozdrin | 2009-12-01 | 1 | -2/+2 |
| * | | | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0. | Alexander Nozdrin | 2009-11-25 | 1 | -39/+75 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 1 | -105/+9 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -105/+9 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -11/+19 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | merge | Vladislav Vaintroub | 2009-11-03 | 1 | -1/+1 |
| | | |\ \ \ \ \ | |||||
| | * | \ \ \ \ \ | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -104/+9 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -104/+9 |
| | * | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -10/+68 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -29/+14 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -6/+6 |
| * | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-23 | 1 | -21/+5 |
| * | | | | | | | | | Backport of: | Konstantin Osipov | 2009-11-20 | 1 | -2/+3 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | merging. | Alexey Botchkov | 2009-11-17 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ |