Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35. | unknown | 2009-05-22 | 1 | -0/+4 |
* | Fixed problems in merge | Michael Widenius | 2009-05-19 | 2 | -13/+13 |
|\ | |||||
| * | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 2 | -13/+13 |
* | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+5 |
|\ \ | |||||
| * | | Apply http://lists.mysql.com/commits/70427 to fix Win32 builds with VS 2005. | Jonathan Perkin | 2009-04-02 | 1 | -3/+0 |
| * | | reverting a bogus fix into 5.1-bugteam | Georgi Kodinov | 2009-03-20 | 1 | -3/+5 |
| * | | Merge contributed automake changes, and 5.1 upstream. | Chad MILLER | 2009-03-19 | 1 | -0/+3 |
| |\ \ | |||||
| | * \ | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -2/+5 |
| | |\ \ | |||||
| | * \ \ | auto-merge | Ignacio Galarza | 2009-03-17 | 5 | -77/+64 |
| | |\ \ \ | |||||
| | * \ \ \ | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -0/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -1/+1 |
| * | | | | | | Copy include/config.h to include/my_config.h at configure-time. Also, | Chad MILLER | 2009-03-19 | 1 | -5/+3 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Manual merge of patch for bug #40552 into the team tree. | Alexey Kopytov | 2009-03-16 | 1 | -2/+5 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Fix for bug #40552: Race condition around default_directories | Alexey Kopytov | 2009-02-27 | 1 | -2/+5 |
* | | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 6 | -82/+66 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 5 | -77/+64 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | merge of bug 42434 to 5.1-bugteam | Georgi Kodinov | 2009-03-11 | 1 | -64/+26 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug #42434: license of mysys MD5 implementation is not GPL-compatible | Georgi Kodinov | 2009-03-09 | 1 | -64/+26 |
| | * | | | | | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteam | He Zhenxing | 2009-03-06 | 1 | -0/+1 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | BUG#22082 Slave hangs(holds mutex) on "disk full" | He Zhenxing | 2009-03-06 | 1 | -0/+1 |
| | | * | | | | Automerge. | Alexey Kopytov | 2009-02-25 | 1 | -0/+3 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge bug 39370 fix from bug tree. | Chad MILLER | 2009-02-24 | 1 | -0/+1 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Bug#39370: wrong output for error code 153 | Chad MILLER | 2009-02-24 | 1 | -0/+1 |
| | | | | |_|_|/ | | | | |/| | | | |||||
| | * | | | | | | Automerge. | Alexey Kopytov | 2009-02-25 | 1 | -0/+3 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | 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 |
| | | | |/ / / | |||||
| | * | | | | | merging. | Alexey Botchkov | 2009-02-24 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Bug#39289 libmysqld.a calls exit() upon error | Alexey Botchkov | 2008-10-27 | 1 | -1/+1 |
| | * | | | | | Manual merge to 5.1. | Alexey Kopytov | 2009-02-23 | 2 | -11/+33 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Fix for bug #15936: "round" differs on Windows to Unix | Alexey Kopytov | 2009-02-23 | 2 | -11/+33 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Merge from bugteam team tree. | Chad MILLER | 2009-02-10 | 3 | -5/+5 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Bug#34309: '_PC' macro redefinition | Chad MILLER | 2009-01-27 | 1 | -1/+0 |
| * | | | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 3 | -5/+2 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | merging | Alexey Botchkov | 2009-02-05 | 1 | -1/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug#40536: SELECT is blocked by INSERT DELAYED waiting on | Davi Arnaut | 2009-02-03 | 1 | -1/+2 |
| | * | | | | | Bug#37995 Error message truncation in test "innodb" in embedded mode. | Alexey Botchkov | 2009-02-05 | 2 | -4/+0 |
| | |/ / / / | |||||
* | | | | | | Fix Valgrind errors seen in buildbot. | unknown | 2009-04-08 | 1 | -0/+6 |
* | | | | | | Apply patch by Antony Dovgal: | Michael Widenius | 2009-03-22 | 1 | -0/+2 |
* | | | | | | Avoid compiler warnings on windows | Michael Widenius | 2009-03-20 | 1 | -5/+27 |
* | | | | | | Added mariadb and mariadb-version as my.conf option tags | Michael Widenius | 2009-03-18 | 1 | -0/+1 |
* | | | | | | Added "pool-of-threads" handling (with libevent) | Michael Widenius | 2009-03-13 | 5 | -4/+14 |
* | | | | | | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 4 | -31/+38 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge of MyISAM changes done in 5.1-main, into Maria | Guilhem Bichot | 2009-02-12 | 1 | -1/+1 |
| * | | | | | Fixing problems of previous 5.1-main->5.1-maria merge: | Guilhem Bichot | 2009-02-12 | 1 | -0/+1 |
| * | | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 6 | -33/+58 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-30 | 1 | -0/+3 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Fix for bug #37756: enabling fulltext indexes with | Ramil Kalimullin | 2009-01-26 | 1 | -1/+1 |
| | * | | | | Fix Bug#32831: libmysql should be built with all charsets | Timothy Smith | 2009-01-13 | 1 | -29/+35 |
* | | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 6 | -3/+24 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 3 | -0/+13 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | |