summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Up-merge 5.0.66a-release changes (via 5.0) into 5.1.Timothy Smith2008-07-171-0/+1
|\
| * Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnfTimothy Smith2008-07-161-0/+1
| * Merge bk-internal:/home/bk/mysql-5.0unknown2008-05-051-2/+6
| |\
| | * Correct failing build.unknown2008-04-281-2/+6
| * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294unknown2008-04-031-1/+1
| |\ \ | | |/ | |/|
| * | Merge amd64.(none):/src/mysql-5.0-bugteamunknown2008-03-281-44/+52
| |\ \
| | * | Bug#26243 mysql command line crash after control-cunknown2008-03-281-44/+52
| * | | Merge mysql.com:/misc/mysql/mysql-5.0unknown2008-03-272-4/+2
| |\ \ \
| | * \ \ Merge host.loc:/home/uchum/work/mysql-5.0unknown2008-03-272-4/+2
| | |\ \ \
| * | \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2008-03-271-4/+4
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2008-03-141-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | 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 afterunknown2008-05-202-3/+24
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-05-202-1/+4
|\ \ \ \ \ \
| * | | | | | Implement some code review fixes for the fix for Bug#27430 unknown2008-05-181-0/+3
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-04-191-1/+1
| |\ \ \ \ \ \
| | * | | | | | Tentative implementation ofunknown2008-04-081-1/+1
* | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |