summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Bug#44164: TL_WRITE has no description in lock_descriptions[]Davi Arnaut2009-04-141-0/+4
* merge -5.0 into -5.1 (minor conflicts resolved)Timothy Smith2009-04-011-34/+35
|\
| * auto-merge -build into -bugteamTimothy Smith2009-04-011-34/+35
| |\
| | * Merge the main tree into 5.0-buildJoerg Bruehe2009-03-301-1/+1
| | |\
| | * | cmd-line-utils/libedit/readline/readline.hunknown2009-03-191-34/+35
| * | | Automerge.Alexey Kopytov2009-03-251-2/+12
| |\ \ \ | | |_|/ | |/| |
| * | | auto-mergeIgnacio Galarza2009-03-195-75/+64
| |\ \ \ | | | |/ | | |/|
* | | | Correct failing archive test.Ignacio Galarza2009-03-251-3/+0
* | | | Manual merge.Alexey Kopytov2009-03-251-3/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can Alexey Kopytov2009-03-241-2/+12
* | | | 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
* | | | | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| |/ / /
| * | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-301-0/+3
| |\ \ \
| | * \ \ merge: 5.1 -> 5.1-rplLuis Soares2009-01-233-0/+13
| | |\ \ \
| | * \ \ \ merge: 5.1 -> 5.1-rplLuis Soares2009-01-083-3/+6
| | |\ \ \ \
| | * \ \ \ \ merge 5.1 --> 5.1-rplAlfranio Correia2008-12-131-5/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r...Andrei Elkin2008-11-122-5/+11
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merging 5.1 main into 5.1-rplMats Kindahl2008-10-232-25/+71
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Merging 5.1 main into 5.1-rpl.Mats Kindahl2008-10-064-1180/+815
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-062-1/+6
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fixning compiler warnings. Fixing build failure for valgrind platform.Mats Kindahl2008-08-221-0/+3
* | | | | | | | | | | Bug#34309: '_PC' macro redefinitionChad MILLER2009-01-271-1/+0
|/ / / / / / / / / /
* | | | | | | | | | 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
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-053-3/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |