Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-03-20 | 1 | -3/+3 |
|\ | |||||
| * | Plugin author, description and version are available | Sergey Vojtovich | 2010-03-16 | 1 | -3/+3 |
* | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-03-07 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2010-02-26 | 1 | -1/+1 |
* | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2010-02-05 | 3 | -8/+5 |
|\ \ | |||||
| * \ | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Merging from 5.0-bugteam | Staale Smedseng | 2010-01-27 | 1 | -1/+1 |
| | |\ | |||||
| * | \ | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-25 | 1 | -6/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | merge | Georgi Kodinov | 2009-12-24 | 1 | -6/+3 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #48866: mysql.test fails under Fedora 12 | Georgi Kodinov | 2009-12-16 | 1 | -6/+3 |
| * | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-23 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#43397 mysql headers redefine pthread_mutex_init | Staale Smedseng | 2009-12-20 | 1 | -1/+1 |
* | | | | Auto merge from 5.1-rep-semisync | He Zhenxing | 2010-02-04 | 1 | -2/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Bug#49894 shifted MYSQL_REPLICATION_PLUGIN number | He Zhenxing | 2010-02-04 | 1 | -2/+3 |
* | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 2 | -1/+4 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 2 | -1/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 2 | -0/+7 |
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 3 | -1/+18 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 3 | -1/+18 |
* | | | | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 1 | -4/+0 |
|\ \ \ \ | |||||
| * | | | | Remove .cvsignore files (attempt #2). | Alexander Nozdrin | 2009-12-16 | 1 | -4/+0 |
* | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge from 5.0 | Staale Smedseng | 2009-12-06 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
* | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 44 | -488/+697 |
|\ \ \ \ | |||||
| * \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-10 | 12 | -264/+409 |
| |\ \ \ \ | |||||
| | * \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-05 | 7 | -238/+50 |
| | |\ \ \ \ | |||||
| | * | | | | | unit tests for my_vsnprintf, | Sergei Golubchik | 2009-11-04 | 1 | -1/+1 |
| | * | | | | | WL#4903 Plugin Service API part I | Sergei Golubchik | 2009-11-02 | 9 | -155/+326 |
| | * | | | | | backport of dbug extensions from 6.0: | Sergei Golubchik | 2009-10-30 | 3 | -109/+83 |
| * | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 4 | -2/+30 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -0/+2 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | * | | | | | | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 27 | -4/+208 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-22 | 6 | -15/+25 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Backport WL#4098 from 6.0. | Alexander Nozdrin | 2009-10-21 | 1 | -0/+1 |
| * | | | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 28 | -4/+210 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 27 | -4/+208 |
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 27 | -4/+208 |
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | |||||
| | | | * | | | | | | Manual merge semi-sync to 5.1-rep+2 | He Zhenxing | 2009-10-03 | 2 | -1/+88 |
| | | | |\ \ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | | | |||||
| | | | | * | | | | | Backporting WL#4398 WL#1720 | He Zhenxing | 2009-09-26 | 2 | -1/+88 |
| | | | * | | | | | | Backport BUG#25192 Using relay-log and relay-log-index without values produce... | He Zhenxing | 2009-10-02 | 1 | -0/+1 |
| | | | * | | | | | | WL#4828 and BUG#45747 | Alfranio Correia | 2009-09-29 | 1 | -0/+19 |
| | | | * | | | | | | WL#5016: Fix header file include guards | Mats Kindahl | 2009-09-23 | 23 | -3/+100 |
| | | | |/ / / / / | |||||
| | * | | | | | | | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 3 | -10/+13 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | * | | | | | | | WL#1349 Use operating system localization to send it as a default client char... | Alexander Barkov | 2009-10-21 | 1 | -0/+2 |
| * | | | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 6 | -15/+25 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 5 | -5/+12 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | A postfix for WL#751 | Alexander Barkov | 2009-10-16 | 1 | -0/+1 |
| | | * | | | | | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 2 | -1/+6 |
| | | * | | | | | | Backporting WL#4164 Two-byte collation IDs | Alexander Barkov | 2009-10-15 | 3 | -4/+5 |
| | | | |/ / / / | | | |/| | | | |