summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* Merge damien-katzs-computer.local:/Users/dkatz/50dkatz@damien-katzs-computer.local2007-07-132-2/+2
|\
| * Minor fixes for test failures and compiler warnings for Bug #29579.dkatz@damien-katzs-computer.local2007-07-132-2/+2
* | Merge damien-katzs-computer.local:/Users/dkatz/mysql50dkatz@damien-katzs-computer.local2007-07-124-3/+34
|\ \ | |/
| * Bug #29579 Clients using SSL can hang the serverdkatz@damien-katzs-computer.local2007-07-124-3/+34
* | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbtomas@whalegate.ndb.mysql.com2007-06-171-2/+18
|\ \
| * | correct warningtomas@whalegate.ndb.mysql.com2007-06-141-1/+1
| * | get mgmapi error codes into perrortomas@whalegate.ndb.mysql.com2007-06-141-2/+18
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-248-113/+114
|\ \ \ | |/ / |/| |
| * | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-108-113/+114
* | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-05-041-1/+1
|\ \ \ | |/ / |/| |
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-04-271-1/+1
| |\ \
| | * | wl#2936 post-merge fixesserg@janus.mylan2007-04-161-1/+1
* | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50tsmith@quadxeon.mysql.com2007-04-281-5/+18
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug #27390: mysqld_multi --config-file= not working as documentedtsmith@quadxeon.mysql.com2007-04-281-5/+18
| * | Bug#24732 Executables do not include Vista manifestsiggy@recycle.(none)2007-04-231-0/+7
* | | Bug#24732 Executables do not include Vista manifestsiggy@recycle.(none)2007-04-231-0/+5
* | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-111-16/+21
|\ \ \ | |/ / | | / | |/ |/|
| * Bug#21765 Illegal Instruction crash on pre-pentium when using YASSLmsvensson@pilot.blaudden2007-04-111-16/+21
| * Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-04-0231-176/+964
| |\
| | * Import yaSSLmsvensson@pilot.blaudden2007-03-281-0/+3
* | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-04-0234-183/+967
|\ \ \
| * | | Import yaSSLmsvensson@pilot.blaudden2007-03-286-7/+6
| * | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-282-3/+9
| |\ \ \ | | | |/ | | |/|
| | * | Set yaSSL to use same type as MySQL do for socket handlesmsvensson@pilot.blaudden2007-03-282-3/+9
| * | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-234-5/+4
| |\ \ \ | | |/ /
| | * | Import patch from yaSSL after fixing warnings upstreammsvensson@pilot.blaudden2007-03-234-5/+4
| * | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-2331-173/+953
| |\ \ \ | | |/ /
| | * | Import yassl 1.6.0msvensson@pilot.blaudden2007-03-2331-173/+953
* | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-03-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildkent@kent-amd64.(none)2007-03-221-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-03-221-1/+1
| | |/
* | | Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@pilot.blaudden2007-03-212-604/+32
|\ \ \ | |/ /
| * | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildkent@kent-amd64.(none)2007-03-202-604/+32
| |\ \ | | |/
| | * Many files:kent@mysql.com/kent-amd64.(none)2007-03-192-604/+32
* | | my_print_default does not need to be linked with odbc32.lib(and friends)msvensson@pilot.blaudden2007-03-201-1/+1
|/ /
* | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50tsmith@quadxeon.mysql.com2007-03-081-2/+2
|\ \ | |/
| * comp_err.c: return ha_checksum from checksum_format_specifier() - more corre...tsmith@quadxeon.mysql.com2007-03-081-2/+2
| * Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-03-0126-123/+178
| |\
| | * Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-225-8/+14
| | * After merge fixesmonty@mysql.com/narttu.mysql.fi2007-02-213-5/+3
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-2121-112/+163
| | |\
* | | \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-03-0110-17/+29
|\ \ \ \
| * | | | Fixed windows compilation problemsmonty@mysql.com/narttu.mysql.fi2007-02-241-0/+2
| * | | | Fixed compilations problems and warnings on windowsmonty@mysql.com/narttu.mysql.fi2007-02-232-11/+8
| * | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-239-14/+27
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug26678/my50-bug26678msvensson@pilot.blaudden2007-02-272-6/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Bug#26678 SSL tests fail on win64msvensson@pilot.blaudden2007-02-272-6/+6
| * | | | Link comp_err with zlibmsvensson@pilot.blaudden2007-02-231-1/+1
* | | | | Link comp_err with zlibmsvensson@pilot.blaudden2007-02-241-1/+1
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_ch...msvensson@pilot.blaudden2007-02-222-9/+9
|\ \ \ \ \ | |/ / / /
View Lorry Controller Status