summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge damien-katzs-computer.local:/Users/dkatz/mysql50dkatz@damien-katzs-computer.local2007-04-301-1/+6
|\
| * Merge damien-katzs-computer.local:/Users/dkatz/mysql50dkatz@damien-katzs-computer.local2007-04-301-1/+6
| |\
| | * Bug #25761 Table is partially created when disk is full, causing database c...dkatz@damien-katzs-computer.local2007-04-191-1/+6
* | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50tsmith@quadxeon.mysql.com2007-04-281-1/+1
|\ \ \ | |/ /
| * | Bug #27390: mysqld_multi --config-file= not working as documentedtsmith@quadxeon.mysql.com2007-04-281-1/+1
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2007-04-201-2/+2
|\ \ \ | |/ /
| * | Avoid compiler warnings.cmiller@zippy.cornsilk.net2007-04-201-2/+2
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint--pthreadkey...cmiller@zippy.cornsilk.net2007-04-191-2/+3
|\ \ \ | |/ /
| * | Bug #27964: pthread_key_create doesn't set errno, so don't report \cmiller@zippy.cornsilk.net2007-04-191-2/+3
| * | Merge mysql.com:/home/ram/work/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-04-191-4/+4
| |\ \
| * \ \ Merge siva.hindu.god:/home/tsmith/m/bk/50tsmith@siva.hindu.god2007-04-181-0/+4
| |\ \ \ | | | |/ | | |/|
| * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@a88-113-38-195.elisa-laajakaista.fi2007-04-132-221/+17
| |\ \ \
| * \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2007-04-125-96/+64
| |\ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelserg@janus.mylan2007-04-025-16/+15
| |\ \ \ \ \
* | \ \ \ \ \ Merge mysql.com:/home/ram/work/b26851/b26851.5.0ramil/ram@ramil.myoffice.izhnet.ru2007-04-191-4/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix for ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-04-161-4/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/51tsmith@siva.hindu.god2007-04-186-7/+29
|\ \ \ \ \ \
| * | | | | | Clear field_alloc when it's moved to result set (allows us to always call fre...monty@mysql.com/narttu.mysql.fi2007-04-161-2/+0
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@ua141d10.elisa.omakaista.fi2007-04-105-5/+29
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@ua141d10.elisa.omakaista.fi2007-04-045-5/+29
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marveljani@ua141d10.elisa.omakaista.fi2007-04-034-5/+7
| | | |\ \ \ \ \ \
| | | | * | | | | | Merged from 5.0jani@ua141d10.elisa.omakaista.fi2007-03-291-1/+4
| | | | * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marveljani@ua141d10.elisa.omakaista.fi2007-03-293-27/+48
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marveljani@ua141d10.elisa.omakaista.fi2007-03-293-4/+3
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|/ / / | | | | | |/| | | | |
| | | | | * | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-mainjani@ua141d10.elisa.omakaista.fi2007-03-285-16/+15
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Fixes for 4.1 to be as in 5.0 and above.jani@ua141d10.elisa.omakaista.fi2007-03-271-1/+2
| | | | | | * | | | | | Fixed compiler warnings.jani@ua141d10.elisa.omakaista.fi2007-03-2227-94/+107
| | | * | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1jamppa@bk-internal.mysql.com2007-04-031-0/+22
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1jamppa@bk-internal.mysql.com2007-03-293-27/+48
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelmonty@narttu.mysql.fi2007-03-241-0/+22
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marveljani@ua141d10.elisa.omakaista.fi2007-03-191-0/+22
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Added find_type_or_exit and find_bit_type_or_exit as wrappersjani@ua141d10.elisa.omakaista.fi2007-03-191-0/+22
* | | | | | | | | | | | | | Merge damien-katzs-computer.local:/Users/dkatz/50bdkatz@damien-katzs-computer.local2007-04-161-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge damien-katzs-computer.local:/Users/dkatz/mysql50dkatz@damien-katzs-computer.local2007-04-161-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Bug #27322 failure to allocate transaction_prealloc_size causes crashdkatz@damien-katzs-computer.local2007-04-121-0/+4
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | my_memmem.c:kent@mysql.com/kent-amd64.(none)2007-04-111-1/+17
| * | | | | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-04-071-220/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge mysql.com:/home/kent/bk/sotest/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-04-051-220/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | Deleted reject files accidently checked inkent@mysql.com/kent-amd64.(none)2007-04-051-220/+0
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| * | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-04-025-96/+64
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge polly.local:/tmp/maint/bug26844/my50-bug26844kaa@polly.local2007-03-282-3/+3
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-233-93/+61
| | |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Portability fix to work around OS X -x86 toolchain bug with common (uninitial...tsmith@quadxeon.mysql.com2007-04-041-1/+1
* | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@quadxeon.mysql.com2007-04-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2007-04-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fix warnings.kostja@bodhi.local2007-03-271-1/+1
| | * | | | | | | | | | | Change find_type family to accept const TYPELIB*.kostja@bodhi.local2007-03-271-1/+1
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-04-025-85/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge polly.local:/tmp/maint/bug26844/my51-bug26844kaa@polly.local2007-03-282-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug26844/my50-bug26844kaa@polly.local2007-03-282-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |