Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 3 | -5/+10 |
|\ | |||||
| * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -19/+34 |
| |\ | |||||
| * | | Fix test suite so that it works when doing configure --without-uca | Michael Widenius | 2009-12-27 | 1 | -1/+1 |
| * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 2 | -10/+10 |
| |\ \ | |||||
| * \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 4 | -336/+367 |
| |\ \ \ | |||||
| * \ \ \ | MySQL 5.1.38 merge into MariaDB. | unknown | 2009-09-15 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 4 | -6/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 4 | -7/+5 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 8 | -24/+29 |
* | | | | | | | | Backport fixes for some of the more noise compiler warnings in ndb. | Davi Arnaut | 2010-07-24 | 3 | -8/+8 |
* | | | | | | | | Bug#42733: Type-punning warnings when compiling MySQL | Davi Arnaut | 2010-07-24 | 21 | -171/+171 |
* | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 9 | -15/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 2 | -2/+2 |
| * | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 7 | -13/+13 |
* | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-14 | 2 | -19/+34 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Bug#48327: Some crashes specific to FreeBSD ("embedded") | Davi Arnaut | 2010-07-14 | 2 | -19/+34 |
* | | | | | | | | Another incarnation of the patch for Bug#30708 | Alexander Nozdrin | 2010-05-19 | 34 | -108/+0 |
* | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-03-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-28 | 5 | -18/+18 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Bug #33544 UDF_INIT member decimals initialized wrong with | Magne Mahre | 2009-11-11 | 1 | -4/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Bug #33544: UDF_INIT member decimals initialized wrong with | unknown | 2008-03-05 | 1 | -4/+0 |
* | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-03-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Bug #35250: readline check breaks when doing vpath build | Georgi Kodinov | 2010-03-09 | 1 | -1/+1 |
* | | | | | | | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Bug #35250: readline check breaks when doing vpath build | Georgi Kodinov | 2010-02-12 | 1 | -1/+1 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 5 | -18/+18 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | / / / / / / / / / | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Apply patch on behalf of the NDB team: | Davi Arnaut | 2010-01-20 | 5 | -18/+18 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Automerge. | Davi Arnaut | 2009-11-02 | 1 | -1/+1 |
| | * | | | | | | | automerge | Georgi Kodinov | 2009-09-18 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
* | | | | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Backport BUG#25192 Using relay-log and relay-log-index without values produce... | He Zhenxing | 2009-10-02 | 1 | -0/+8 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-09-19 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge from mysql-5.1.38-release | Jonathan Perkin | 2009-09-03 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Apply patch from bug#46834 to install the test suite in RPMs. | Jonathan Perkin | 2009-08-21 | 1 | -1/+2 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2009-09-16 | 5 | -345/+376 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | A patch for Bug#45118 (mysqld.exe crashed in debug mode | Alexander Nozdrin | 2009-09-10 | 1 | -9/+9 |
| |/ / / / / | |||||
| * | | | | | Increase thread stack size on HP-UX when built with debug. | Davi Arnaut | 2009-09-02 | 1 | -1/+6 |
| * | | | | | Bug#45611: Minor code cleanup | Davi Arnaut | 2009-09-01 | 2 | -6/+5 |
| * | | | | | Fix for a few assorted compiler warnings. | Davi Arnaut | 2009-08-28 | 1 | -329/+356 |
| |/ / / / | |||||
* | | | | | merge of 5.1-main into mysql-trunk. | Guilhem Bichot | 2009-08-12 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Auto-merge | Ignacio Galarza | 2009-07-31 | 1 | -1/+1 |
* | | | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}: | Guilhem Bichot | 2009-08-04 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Add missing newline to usage message of ndb_print_backup_file (Bug #34989) | Jim Winstead | 2009-04-28 | 1 | -1/+1 |
* | | | | | Merge MySQL 5.1.35 into MySQL 5.4 | Mikael Ronstrom | 2009-06-11 | 2 | -4/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge from 5.0-bugteam | Staale Smedseng | 2009-04-16 | 2 | -4/+4 |
| | |_|/ | |/| | | |||||
* | | | | Bug #44536: MySQL 5.4 version mismatch in the sources | MySQL Build Team | 2009-05-22 | 1 | -1/+1 |