summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \
| | * \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginessvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| | |\ \ \
| | | * | | Addition to fix forsvoj@mysql.com/june.mysql.com2007-05-171-1/+1
| * | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-enginessvoj@april.(none)2007-05-171-4/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-enginessvoj@mysql.com/april.(none)2007-05-171-4/+13
| | |\ \ \ \ | | | |/ / /
| | | * | | BUG#25712 - insert delayed and check table run together report crashedsvoj@mysql.com/april.(none)2007-05-161-2/+13
| * | | | | Bug#17332 - changing key_buffer_size on a running serveristruewing@chilla.local2007-05-141-26/+70
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-05-102-479/+2048
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Bug#17332 - changing key_buffer_size on a running serveristruewing@chilla.local2007-03-231-133/+86
| | * | | | Merge chilla.local:/home/mydev/mysql-5.1-bug17332-oldistruewing@chilla.local2007-03-202-470/+2086
| | |\ \ \ \
| | | * | | | Bug#17332 - changing key_buffer_size on a running serveristruewing@chilla.local2007-01-312-470/+2089
* | | | | | | Merge pilot.(none):/data/msvensson/mysql/bug27597/my51-bug27597msvensson@pilot.(none)2007-05-291-0/+36
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge pilot.(none):/data/msvensson/mysql/bug27597/my50-bug27597msvensson@pilot.(none)2007-05-291-0/+36
| |\ \ \ \ \ \
| | * | | | | | Bug#27597 mysqld-debug brokenmsvensson@pilot.blaudden2007-05-141-0/+36
* | | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-05-044-15/+219
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | WL#2936 - Falcon & MySQL plugin interface: server variablesistruewing@chilla.local2007-04-301-4/+8
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-04-274-15/+215
| |\ \ \ \ \ \ \
| | * | | | | | | fixed: memleak in --help, sigsegv on shutdownserg@sergbook.mysql.com2007-04-261-0/+24
| | * | | | | | | WL#2936 - Falcon & MySQL plugin interface: server variablesistruewing@chilla.local2007-04-241-0/+3
| | * | | | | | | WL#2936 - Falcon & MySQL plugin interface: server variablesistruewing@chilla.local2007-04-181-3/+6
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@sergbook.mysql.com2007-04-164-15/+185
| | |\ \ \ \ \ \ \
| | | * | | | | | | wl#2936 - fixing problemsserg@janus.mylan2007-04-131-8/+8
| | | * | | | | | | WL#2936antony@ppcg5.local2007-03-232-9/+11
| | | * | | | | | | WL#2936antony@ppcg5.local2007-03-024-4/+172
* | | | | | | | | | 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