Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-17 | 1 | -1/+1 |
|\ | |||||
| * | Automerge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2009-12-17 | 1 | -1/+1 |
| |\ | |||||
| | * | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -0/+3 |
* | | | | Merge | Mikael Ronstrom | 2009-12-14 | 1 | -1/+11 |
|\ \ \ \ | |||||
| * | | | | WL#2360 Performance schema | Marc Alff | 2009-11-30 | 1 | -1/+11 |
* | | | | | Merge WL#5138 to mysql-next-mr | Mikael Ronstrom | 2009-11-27 | 1 | -11/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -11/+0 |
| |/ / / | |||||
* | | | | WL#5138 merged to mysql-next-mr | Mikael Ronstrom | 2009-11-20 | 1 | -0/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t... | Mikael Ronstrom | 2009-10-12 | 1 | -0/+2 |
* | | | | backport of dbug extensions from 6.0: | Sergei Golubchik | 2009-10-30 | 1 | -2/+2 |
* | | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | A postfix for WL#751 | Alexander Barkov | 2009-10-16 | 1 | -0/+1 |
* | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -6/+0 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Merge from 5.0 | Staale Smedseng | 2009-09-17 | 1 | -6/+0 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-17 | 1 | -6/+0 |
* | | | | merge | Vladislav Vaintroub | 2009-09-23 | 1 | -0/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -0/+19 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -0/+13 |
| | * | MySQL 5.0 backport of Chad Miller's patch for Bug#34309: | Davi Arnaut | 2009-05-30 | 1 | -1/+0 |
* | | | This is the downport of | Vladislav Vaintroub | 2009-09-11 | 1 | -4/+37 |
|/ / | |||||
* | | Merge 5.1-bugteam -> 5.1-innodb_plugin. | Sergey Vojtovich | 2009-07-14 | 1 | -1/+1 |
|\ \ | |||||
| * | | Bug #43397 mysql headers redefine pthread_mutex_init | Staale Smedseng | 2009-07-08 | 1 | -1/+1 |
* | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin. | Vladislav Vaintroub | 2009-06-10 | 1 | -0/+13 |
|/ / | |||||
* | | merge -5.0 into -5.1 (minor conflicts resolved) | Timothy Smith | 2009-04-01 | 1 | -34/+35 |
|\ \ | |/ | |||||
| * | auto-merge -build into -bugteam | Timothy Smith | 2009-04-01 | 1 | -34/+35 |
| |\ | |||||
| | * | cmd-line-utils/libedit/readline/readline.h | unknown | 2009-03-19 | 1 | -34/+35 |
| * | | Automerge. | Alexey Kopytov | 2009-03-25 | 1 | -2/+12 |
| |\ \ | | |/ | |/| | |||||
* | | | Manual merge. | Alexey Kopytov | 2009-03-25 | 1 | -3/+13 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can | Alexey Kopytov | 2009-03-24 | 1 | -2/+12 |
* | | | Automerge. | Alexey Kopytov | 2009-02-25 | 1 | -0/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fixed a build failure on Ubuntu 8.10 introduced by the patch | Alexey Kopytov | 2009-02-25 | 1 | -0/+3 |
* | | | Manual merge to 5.1. | Alexey Kopytov | 2009-02-23 | 1 | -2/+33 |
|\ \ \ | |/ / | |||||
| * | | Fix for bug #15936: "round" differs on Windows to Unix | Alexey Kopytov | 2009-02-23 | 1 | -2/+33 |
| |/ | |||||
* | | Merge from bugteam team tree. | Chad MILLER | 2009-02-10 | 1 | -1/+3 |
|\ \ | |||||
| * | | Bug#37995 Error message truncation in test "innodb" in embedded mode. | Alexey Botchkov | 2009-02-05 | 1 | -1/+0 |
| * | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 1 | -0/+3 |
| |\ \ | |||||
| * \ \ | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -5/+5 |
| |\ \ \ | |||||
| * | | | | Fixning compiler warnings. Fixing build failure for valgrind platform. | Mats Kindahl | 2008-08-22 | 1 | -0/+3 |
* | | | | | Bug#34309: '_PC' macro redefinition | Chad MILLER | 2009-01-27 | 1 | -1/+0 |
| |_|/ / |/| | | | |||||
* | | | | Merge from mysql-5.0-bugteam to mysql-5.1-bugteam. | Alexey Kopytov | 2008-12-07 | 1 | -0/+3 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | Fix for bug #27483: Casting 'scientific notation type' to 'unsigned | Alexey Kopytov | 2008-12-03 | 1 | -0/+3 |
| * | | Correct failing build. | unknown | 2008-04-28 | 1 | -2/+6 |
| * | | Merge mysql.com:/misc/mysql/mysql-5.0 | unknown | 2008-03-27 | 1 | -1/+1 |
| |\ \ | |||||
* | | | | Bug #35999 When using the embedded server a wrong message comes. | Alexey Botchkov | 2008-06-16 | 1 | -5/+5 |
| |_|/ |/| | | |||||
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2008-04-19 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Tentative implementation of | unknown | 2008-04-08 | 1 | -1/+1 |
* | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2008-03-28 | 1 | -0/+12 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2008-03-13 | 1 | -6/+7 |
| |\ \ \ | |||||
| * \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2008-02-27 | 1 | -0/+12 |
| |\ \ \ \ |