summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge amd64.(none):/src/bug24732/my50-bug24732unknown2007-07-253-4/+6
|\
| * Bug#24732 Executables do not include Vista manifestsunknown2007-07-255-11/+40
* | Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/jul24/50unknown2007-07-240-0/+0
|\ \ | |/
| * Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-07-2411-5/+265
| |\
| | * after-merge fixupunknown2007-07-201-3/+4
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-07-203-3/+25
| | |\
* | | \ Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-07-2412-7/+266
|\ \ \ \
| * | | | after-merge fixupunknown2007-07-201-1/+14
| * | | | Merge mysql.com:/home/ram/work/mysql-5.1-maintunknown2007-07-201-0/+2
| |\ \ \ \
| | * | | | after-merge fixup.unknown2007-07-201-0/+2
| | * | | | Merge mysql.com:/home/ram/work/b29923/b29923.5.0unknown2007-07-200-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fixed #29923: federated.test fails in 5.0-maint, 5.1-maintunknown2007-07-201-0/+2
| | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-07-193-1/+78
| | | |\ \ \
| | | | * \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909unknown2007-07-193-1/+80
| | | | |\ \ \
| * | | | \ \ \ Merge mysql.com:/home/ram/work/b28125/b28125.5.0unknown2007-07-202-4/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fix for bug #28125: ERROR 2013 when adding index.unknown2007-07-183-3/+26
| * | | | | | Merge damien-katzs-computer.local:/Users/dkatz/mysql51unknown2007-07-191-2/+2
| |\ \ \ \ \ \
| | * | | | | | Bug #29910 Sporadic test failure in status.testunknown2007-07-191-2/+2
| * | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909unknown2007-07-193-0/+76
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909unknown2007-07-193-0/+78
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Bug#26909: Specified key was too long; max key length is 255 bytes \unknown2007-07-183-1/+80
| * | | | | | | | Merge damien-katzs-computer.local:/Users/dkatz/mysql50unknown2007-07-195-1/+159
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge damien-katzs-computer.local:/Users/dkatz/mysql50unknown2007-07-195-1/+159
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug #29784 YaSSL assertion failure when reading 8k key.unknown2007-07-175-1/+159
* | | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0unknown2007-07-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-07-2159-132/+1008
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-2135-21/+3654
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge trift-lap.none:/MySQL/M50/push-5.0unknown2007-07-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge trift-lap.none:/MySQL/M50/bug14151-5.0unknown2007-07-208-7/+7
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge trift-lap.none:/MySQL/M51/bug14151-5.1unknown2007-07-206-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | After-merge fix for bug#14151.unknown2007-07-191-1/+1
| | * | | | | | | | | | | | Merge trift-lap.none:/MySQL/M50/bug14151-5.0unknown2007-07-195-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Avoid the name conflict between the system-provided "md5.h" and the MySQL oneunknown2007-07-198-7/+7
| * | | | | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-07-201-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46unknown2007-07-202-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.44unknown2007-07-192-5/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | BUG#20815 Errno 12 on Windows after 197 connectionsunknown2007-07-191-0/+3
| | | * | | | | | | | | | | | | field.cc, field.h:unknown2007-07-192-1/+2
| | | * | | | | | | | | | | | | make_binary_distribution.sh:unknown2007-07-171-0/+1
| * | | | | | | | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0unknown2007-07-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-07-199-16/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-07-1929-16/+3649
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | CMakeLists.txt, configure.js:unknown2007-07-182-9/+12
| | * | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-buildunknown2007-07-180-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | / / / / / / / / / / / | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | CMakeLists.txt, configure.js:unknown2007-07-182-7/+10
| | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0unknown2007-07-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge trift2.:/MySQL/M50/bug21023-25486-5.0unknown2007-07-173-3/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-07-174-6/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/bug21023-25486-5.1unknown2007-07-173-3/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M50/bug21023-25486-5.0unknown2007-07-173-3/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |