summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2007-07-211-1/+1
|\
| * Merge trift-lap.none:/MySQL/M50/bug14151-5.0joerg@trift-lap.none2007-07-191-1/+1
| |\
| | * Avoid the name conflict between the system-provided "md5.h" and the MySQL onejoerg@trift-lap.none2007-07-191-1/+1
* | | Merge magare.gmz:/home/kgeorge/mysql/work/B29325-my_errno-5.0-optgkodinov/kgeorge@magare.gmz2007-07-181-0/+2
|\ \ \
| * | | Bug #29325: create table overwrites .MYD file of other gkodinov/kgeorge@magare.gmz2007-07-181-0/+2
* | | | Merge magare.gmz:/home/kgeorge/mysql/autopush/B29325-5.0-optgkodinov/kgeorge@magare.gmz2007-07-111-2/+6
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Bug #29469: Client dies if a query is issued after hitting Ctrl + Cgkodinov/kgeorge@magare.gmz2007-07-101-2/+5
| |/
* | Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-enginesantony@ppcg5.local2007-07-061-0/+19
|\ \
| * \ Merge mysql.com:/home/svoj/devel/mysql/BUG27564/mysql-5.0-enginessvoj@june.mysql.com2007-07-051-0/+19
| |\ \ | | |/
| | * Merge mysql.com:/home/svoj/devel/mysql/BUG27564/mysql-4.1-enginessvoj@june.mysql.com2007-07-051-0/+19
| | |\
| | | * BUG#27564 - Valgrind: UDF does not cleanup correctlysvoj@mysql.com/june.mysql.com2007-07-051-0/+19
| | | * Merge mysql.com:/home/svoj/devel/bk/mysql-4.1svoj@mysql.com/june.mysql.com2007-05-231-2/+13
| | | |\
| | | * | Fixed bug #20710.gshchepa/uchum@gshchepa.loc2007-04-291-0/+13
* | | | | Patch for the following bugs:anozdrin/alik@ibm.2007-06-281-7/+7
|/ / / /
* | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50tsmith@maint1.mysql.com2007-06-212-15/+27
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@dl145h.mysql.com2007-06-182-15/+27
| |\ \ \
| | * \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@dl145j.mysql.com2007-06-182-15/+27
| | |\ \ \
| | | * \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@dl145k.mysql.com2007-06-112-15/+27
| | | |\ \ \
| | | | * | | Bug#28916 LDML doesn't work for utf8bar@mysql.com/bar.myoffice.izhnet.ru2007-06-072-15/+27
| * | | | | | Merge chilla.local:/home/mydev/mysql-5.0-amainistruewing@chilla.local2007-06-162-6/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge xiphis.org:/home/antony/work2/mysql-5.0-enginesacurtis/antony@ltamd64.xiphis.org2007-06-062-6/+6
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge pilot.(none):/data/msvensson/mysql/bug28690/my50-bug28690msvensson@pilot.(none)2007-06-071-16/+20
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50tsmith@quadxeon.mysql.com2007-05-301-4/+13
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | Manual merge.kostja@bodhi.(none)2007-06-191-0/+64
|\ \ \ \ \ \ \
| * | | | | | | This the 4-th patch in scope of CS patch (BUG#11986).anozdrin/alik@ibm.2007-06-141-0/+64
* | | | | | | | Merge chilla.local:/home/mydev/mysql-5.1-amainistruewing@chilla.local2007-06-162-6/+6
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-5.1-amainistruewing@chilla.local2007-06-112-6/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-06-062-6/+6
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.0-enginessvoj@april.(none)2007-06-051-0/+1
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | BUG#27141 - Calling tell(-1) under Windows causes assertion failure in Debug ...svoj@mysql.com/april.(none)2007-06-051-0/+1
| | | * | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-axmrgistruewing@chilla.local2007-05-311-6/+5
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug23068istruewing@chilla.local2007-05-311-6/+5
| | | | |\ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | | * | | | | Bug#28478 - Improper key_cache_block_size corrupts MyISAM tablesistruewing@chilla.local2007-05-311-6/+5
| | | | * | | | | | Merge mysql.com:/home/svoj/devel/bk/mysql-5.0svoj@mysql.com/june.mysql.com2007-05-231-4/+13
| | | | |\ \ \ \ \ \
* | | | | \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-buildtsmith@quadxeon.mysql.com2007-06-151-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-06-061-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Avoid a compile error which arises from a redefinition of "inline":joerg@debian.(none)2007-06-011-0/+3
| | |/ / / / / / / /
* | | | | | | | | | Merge pilot.(none):/data/msvensson/mysql/bug28690/my51-bug28690msvensson@pilot.(none)2007-06-071-3/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge pilot.(none):/data/msvensson/mysql/bug28690/my50-bug28690msvensson@pilot.(none)2007-06-071-3/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Bug#28690 mysql-enterprise-gpl-5.0.40-linux-i686-glibc won't start on Debian ...msvensson@pilot.(none)2007-06-071-16/+20
| | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge pilot.(none):/data/msvensson/mysql/bug27597/my50-bug27597msvensson@pilot.(none)2007-05-291-0/+36
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-0567-1036/+1050
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Added casts to avoid compiler warnings and fixed a wrong type.jani@a88-113-38-195.elisa-laajakaista.fi2007-05-316-17/+22
| * | | | | | | | Changed accidently added tabs back into spaces.jani@a88-113-38-195.elisa-laajakaista.fi2007-05-281-22/+22
| * | | | | | | | Merged from main 5.1jani@linux-th5m.site2007-05-242-4/+4
| * | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@linux-th5m.site2007-05-2467-996/+1005
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-2467-988/+992
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-1067-987/+991
* | | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-05-303-484/+2106
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-enginessvoj@june.mysql.com2007-05-171-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |