Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-03-07 | 2 | -0/+7 |
|\ | |||||
| * | Workaround the pthread_once_t static initialization. Per the | Davi Arnaut | 2010-02-26 | 1 | -1/+2 |
| * | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2010-02-26 | 2 | -0/+6 |
* | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-02-09 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Recommit of Bug#49447. | Staale Smedseng | 2010-02-04 | 1 | -4/+4 |
* | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -0/+9 |
|\ \ | |/ | |||||
| * | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -0/+9 |
* | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-24 | 1 | -0/+3 |
|\ \ | |||||
| * \ | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-19 | 5 | -56/+84 |
| |\ \ | |||||
| * \ \ | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 4 | -24/+14 |
| |\ \ \ | |||||
| * | | | | Backporting patch for Bug#47756 | Alexander Nozdrin | 2009-12-15 | 1 | -0/+3 |
* | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-23 | 2 | -3/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Manual merge. | Davi Arnaut | 2009-12-18 | 2 | -3/+3 |
| |\ \ \ | |||||
| | * | | | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 2 | -3/+3 |
* | | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 1 | -1/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -1/+5 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -1/+5 |
* | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 3 | -54/+59 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Bug#49134 5.1 server segfaults with 2byte collation file | Alexander Barkov | 2009-12-15 | 1 | -1/+2 |
| * | | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 3 | -53/+57 |
* | | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 1 | -10/+0 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Remove .cvsignore files (attempt #2). | Alexander Nozdrin | 2009-12-16 | 1 | -10/+0 |
* | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -1/+20 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge from 5.0 | Staale Smedseng | 2009-12-06 | 1 | -1/+20 |
| |\ \ \ | | |/ / | |||||
* | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 41 | -563/+1560 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-10 | 2 | -0/+32 |
| |\ \ \ | |||||
| | * \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-05 | 3 | -18/+41 |
| | |\ \ \ | |||||
| | * | | | | WL#4903 Plugin Service API part I | Sergei Golubchik | 2009-11-02 | 1 | -0/+23 |
| | * | | | | backport of dbug extensions from 6.0: | Sergei Golubchik | 2009-10-30 | 1 | -0/+9 |
| * | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 2 | -2/+7 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -9/+32 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 4 | -10/+76 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Fix for bug #45143 "All connections hang on concurrent ALTER TABLE". | Dmitry Lenev | 2009-10-26 | 1 | -9/+32 |
| * | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 4 | -10/+76 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 4 | -10/+76 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Backport post fix compiler warnings and test failures for BUG#25192 BUG#12190 | He Zhenxing | 2009-10-02 | 1 | -2/+2 |
| | | * | | | | Backport BUG#25192 Using relay-log and relay-log-index without values produce... | He Zhenxing | 2009-10-02 | 2 | -10/+68 |
| | | * | | | | WL#5016: Fix header file include guards | Mats Kindahl | 2009-09-23 | 2 | -0/+8 |
| * | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 14 | -76/+71 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 3 | -16/+23 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 2 | -11/+18 |
| | | * | | | | | Backporting WL#4164 Two-byte collation IDs | Alexander Barkov | 2009-10-15 | 1 | -5/+5 |
| | * | | | | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-19 | 4 | -47/+6 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 6 | -13/+38 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-09 | 1 | -2/+10 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Bsckporting WL#3764 Sinhala Collation | Alexander Barkov | 2009-10-06 | 1 | -0/+4 |
| * | | | | | | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -8/+8 |
| * | | | | | | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-08 | 8 | -111/+117 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge from mysq-next-mr-wtf. | Alexander Nozdrin | 2009-10-02 | 7 | -111/+114 |
| | |\ \ \ \ \ \ \ |