summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35.unknown2009-05-221-0/+4
* Fixed problems in mergeMichael Widenius2009-05-192-13/+13
|\
| * We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-062-13/+13
* | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+5
|\ \
| * | Apply http://lists.mysql.com/commits/70427 to fix Win32 builds with VS 2005.Jonathan Perkin2009-04-021-3/+0
| * | reverting a bogus fix into 5.1-bugteamGeorgi Kodinov2009-03-201-3/+5
| * | Merge contributed automake changes, and 5.1 upstream.Chad MILLER2009-03-191-0/+3
| |\ \
| | * \ auto-mergeIgnacio Galarza2009-03-191-2/+5
| | |\ \
| | * \ \ auto-mergeIgnacio Galarza2009-03-175-77/+64
| | |\ \ \
| | * \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-0/+3
| | |\ \ \ \
| | | * | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-1/+1
| * | | | | | Copy include/config.h to include/my_config.h at configure-time. Also,Chad MILLER2009-03-191-5/+3
| | |_|_|/ / | |/| | | |
| * | | | | Manual merge of patch for bug #40552 into the team tree.Alexey Kopytov2009-03-161-2/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-271-2/+5
* | | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-256-82/+66
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-015-77/+64
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge of bug 42434 to 5.1-bugteamGeorgi Kodinov2009-03-111-64/+26
| | |\ \ \ \
| | | * | | | Bug #42434: license of mysys MD5 implementation is not GPL-compatibleGeorgi Kodinov2009-03-091-64/+26
| | * | | | | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteamHe Zhenxing2009-03-061-0/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | BUG#22082 Slave hangs(holds mutex) on "disk full"He Zhenxing2009-03-061-0/+1
| | | * | | | Automerge.Alexey Kopytov2009-02-251-0/+3
| | | |\ \ \ \
| | | * \ \ \ \ Merge bug 39370 fix from bug tree.Chad MILLER2009-02-241-0/+1
| | | |\ \ \ \ \
| | | | * | | | | Bug#39370: wrong output for error code 153Chad MILLER2009-02-241-0/+1
| | | | | |_|_|/ | | | | |/| | |
| | * | | | | | Automerge.Alexey Kopytov2009-02-251-0/+3
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Automerge.Alexey Kopytov2009-02-251-0/+3
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | / / | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | Fixed a build failure on Ubuntu 8.10 introduced by the patchAlexey Kopytov2009-02-251-0/+3
| | | | |/ / /
| | * | | | | merging.Alexey Botchkov2009-02-241-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Bug#39289 libmysqld.a calls exit() upon error Alexey Botchkov2008-10-271-1/+1
| | * | | | | Manual merge to 5.1.Alexey Kopytov2009-02-232-11/+33
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Fix for bug #15936: "round" differs on Windows to UnixAlexey Kopytov2009-02-232-11/+33
| | | | |/ / | | | |/| |
| | * | | | Merge from bugteam team tree.Chad MILLER2009-02-103-5/+5
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Bug#34309: '_PC' macro redefinitionChad MILLER2009-01-271-1/+0
| * | | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-113-5/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | mergingAlexey Botchkov2009-02-051-1/+2
| | |\ \ \ \
| | | * | | | Bug#40536: SELECT is blocked by INSERT DELAYED waiting onDavi Arnaut2009-02-031-1/+2
| | * | | | | Bug#37995 Error message truncation in test "innodb" in embedded mode.Alexey Botchkov2009-02-052-4/+0
| | |/ / / /
* | | | | | Fix Valgrind errors seen in buildbot.unknown2009-04-081-0/+6
* | | | | | Apply patch by Antony Dovgal:Michael Widenius2009-03-221-0/+2
* | | | | | Avoid compiler warnings on windowsMichael Widenius2009-03-201-5/+27
* | | | | | Added mariadb and mariadb-version as my.conf option tagsMichael Widenius2009-03-181-0/+1
* | | | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-135-4/+14
* | | | | | Merge with mysql-maria treeMichael Widenius2009-02-194-31/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge of MyISAM changes done in 5.1-main, into MariaGuilhem Bichot2009-02-121-1/+1
| * | | | | Fixing problems of previous 5.1-main->5.1-maria merge:Guilhem Bichot2009-02-121-0/+1
| * | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-126-33/+58
| |\ \ \ \ \ | | |/ / / /
| | * | | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-301-0/+3
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix for bug #37756: enabling fulltext indexes withRamil Kalimullin2009-01-261-1/+1
| | * | | | Fix Bug#32831: libmysql should be built with all charsetsTimothy Smith2009-01-131-29/+35
* | | | | | Merge with base MySQL 5.1Michael Widenius2009-02-156-3/+24
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | merge: 5.1 -> 5.1-rplLuis Soares2009-01-233-0/+13
| |\ \ \ \ \ | | | |/ / / | | |/| | |