summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge ramayana.hindu.god:/home/tsmith/m/bk/bugteam/51unknown2008-04-291-0/+1
|\
| * Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)unknown2008-04-261-0/+1
* | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294unknown2008-04-031-1/+1
|\ \ | |/ |/|
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294unknown2008-04-031-1/+1
| |\
| | * Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3unknown2008-04-031-1/+1
* | | Merge bk-internal:/home/bk/mysql-5.1unknown2008-03-3111-75/+260
|\ \ \
| * | | Fixed problem with non-synchronous error listsunknown2008-03-282-3/+13
| * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-2811-73/+248
| |\ \ \
| | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-2611-73/+248
| | |\ \ \
| | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-132-6/+8
| | | |\ \ \ | | | | |/ /
| | | * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-0711-73/+248
| | | |\ \ \
| | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-2711-73/+248
| | | | |\ \ \
| | | | | * | | Fixed a previous patch.unknown2008-02-181-1/+3
| | | | | * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-1510-72/+245
| | | | | |\ \ \
| | | | | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-0810-71/+244
| | | | | | |\ \ \
| | | | | | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-0710-71/+244
| | | | | | | |\ \ \
| | | | | | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-2610-74/+246
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-0810-74/+246
| | | | | | | | | |\ \ \
| | | | | | | | | | * | | Fixes to merge between 5.1-main and 5.1-marvelunknown2007-10-152-7/+9
| | | | | | | | | | * | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-119-69/+239
* | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-03-281-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-03-281-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix for Bug #27944 Filtering THD::client capabilitiesunknown2008-03-251-0/+31
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge mysql.com:/misc/mysql/mysql-5.1unknown2008-03-272-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge host.loc:/home/uchum/work/mysql-5.1unknown2008-03-272-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-optunknown2008-03-212-4/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)unknown2008-03-212-4/+2
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-272-71/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-03-272-71/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-252-71/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-142-6/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | * | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-052-71/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugsunknown2008-02-281-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Bug #24992 Enabling Shared Memory support on Windows x64 causes client to failunknown2008-02-281-2/+2
| | | | * | | | | | | | | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugsunknown2008-02-272-71/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | | | / / / / / / / | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Bug #23839 Multiple declarations of macrosunknown2008-02-272-60/+5
* | | | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainunknown2008-03-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainunknown2008-03-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Manual mergeunknown2008-03-142-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...unknown2008-03-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Bug#34598unknown2008-02-191-1/+1
| | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1unknown2008-03-252-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge mysql.com:/Users/davi/mysql/mysql-5.0-runtimeunknown2008-03-191-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Bug#30960 processlist state '*** DEAD ***' on recent 5.0.48 windows buildsunknown2008-03-191-4/+4
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optunknown2008-02-271-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplunknown2008-01-301-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2008-03-181-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Bug#25175 Too much memory used by MySQL grant systemunknown2008-03-181-3/+4
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-03-142-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge kaamos.(none):/data/src/mysql-5.1unknown2008-03-122-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |