summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-191-0/+5
* Bug#37003 Tests sporadically crashes with embedded serverDavi Arnaut2008-06-182-1/+62
* Bug#27430 "Crash in subquery code when in PS and table DDL changed afterkostja@bodhi.(none)2008-05-202-3/+24
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2008-05-202-1/+4
|\
| * Implement some code review fixes for the fix for Bug#27430 kostja@bodhi.(none)2008-05-181-0/+3
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2008-04-191-1/+1
| |\
| | * Tentative implementation ofkostja@dipika.(none)2008-04-081-1/+1
* | | Merge ramayana.hindu.god:/home/tsmith/m/bk/bugteam/51tsmith@ramayana.hindu.god2008-04-291-0/+1
|\ \ \
| * | | Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)gshchepa/uchum@host.loc2008-04-261-0/+1
| |/ /
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294cmiller@zippy.cornsilk.net2008-04-031-1/+1
|\ \ \ | |/ / |/| |
| * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294cmiller@zippy.cornsilk.net2008-04-031-1/+1
| |\ \
| | * | Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3cmiller@zippy.cornsilk.net2008-04-031-1/+1
* | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-3111-75/+260
|\ \ \ \
| * | | | Fixed problem with non-synchronous error listsgkodinov/kgeorge@magare.gmz2008-03-282-3/+13
| * | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-2811-73/+248
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-2611-73/+248
| | |\ \ \
| | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-132-6/+8
| | | |\ \ \ | | | | |/ /
| | | * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-0711-73/+248
| | | |\ \ \
| | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2008-02-2711-73/+248
| | | | |\ \ \
| | | | | * | | Fixed a previous patch.jani@hynda.mysql.fi2008-02-181-1/+3
| | | | | * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2008-02-1510-72/+245
| | | | | |\ \ \
| | | | | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-0810-71/+244
| | | | | | |\ \ \
| | | | | | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2007-12-0710-71/+244
| | | | | | | |\ \ \
| | | | | | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-2610-74/+246
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-0810-74/+246
| | | | | | | | | |\ \ \
| | | | | | | | | | * | | Fixes to merge between 5.1-main and 5.1-marveljani@hynda.mysql.fi2007-10-152-7/+9
| | | | | | | | | | * | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1monty@mysql.com/narttu.mysql.fi2007-10-119-69/+239
* | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-281-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-281-0/+31
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix for Bug #27944 Filtering THD::client capabilitiesandrey@whirlpool.hristov.com2008-03-251-0/+31
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge mysql.com:/misc/mysql/mysql-5.1tnurnberg@white.intern.koehntopp.de2008-03-272-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge host.loc:/home/uchum/work/mysql-5.1gshchepa/uchum@host.loc2008-03-272-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-optgkodinov/kgeorge@magare.gmz2008-03-212-4/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)gkodinov/kgeorge@macbook.gmz2008-03-212-4/+2
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-272-71/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@rhel5-ia64-a.mysql.com2008-03-272-71/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-252-71/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-142-6/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | * | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-052-71/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugsiggy@alf.(none)2008-02-281-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Bug #24992 Enabling Shared Memory support on Windows x64 causes client to failiggy@alf.(none)2008-02-281-2/+2
| | | | * | | | | | | | | | | Merge alf.(none):/src/macro_bugs/my50-macro_bugsiggy@alf.(none)2008-02-272-71/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | | | | | / / / / / / / | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Bug #23839 Multiple declarations of macrosiggy@alf.(none)2008-02-272-60/+5
* | | | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainistruewing@stella.local2008-03-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainistruewing@stella.local2008-03-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Manual mergeistruewing@stella.local2008-03-142-6/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...antony@pcg5ppc.xiphis.org2008-03-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Bug#34598acurtis/antony@xiphis.org/ltamd64.xiphis.org2008-02-191-1/+1
| | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@quad.opbmk2008-03-252-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge mysql.com:/Users/davi/mysql/mysql-5.0-runtimedavi@endora.local2008-03-191-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \