summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-226-7/+13
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-215-43/+44
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-225-43/+44
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-155-43/+44
| | |\
| | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-155-43/+44
* | | | Fixed a bad merge. Got a duplicate symbol on OSX.istruewing@chilla.local2007-02-201-2/+0
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2007-02-161-0/+2
|\ \ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2007-02-141-0/+2
| |\ \ \ \
| | * | | | thd_lib_detected moved so that it is correctly declared as a dataantony@ppcg5.local2007-02-062-1/+2
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-02-141-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0ibabaev@bk-internal.mysql.com2007-02-131-1/+1
| |\ \ \ \ \
| | * | | | | Fixed MacOSX/Intel linking problemgkodinov/kgeorge@macbook.gmz2007-02-121-1/+1
| | |/ / / /
* | | | | | Bug#25807: LOAD DATA INFILE does not work with Pipescmiller@zippy.cornsilk.net2007-02-131-6/+35
|/ / / / /
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2007-02-064-27/+273
|\ \ \ \ \ | |/ / / /
| * | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2007-02-022-7/+0
| |\ \ \ \
| | * | | | After merge fixistruewing@chilla.local2007-02-022-7/+0
| * | | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2007-02-013-14/+42
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge chilla.local:/home/mydev/mysql-4.0-axmrgistruewing@chilla.local2007-02-014-16/+44
| | |\ \ \ \
| | | * \ \ \ Merge bk://localhost:5559jani/jamppa@production.mysql.com2007-01-302-0/+6
| | | |\ \ \ \
| | | | * | | | Cleanup of thread-type (linuxthread or NTPL) detection codejani@ua141d10.elisa.omakaista.fi2007-01-304-16/+39
| | | * | | | | Cleanup of thread-type (linuxthread or NTPL) detection codejani@ua141d10.elisa.omakaista.fi2007-01-254-16/+38
| | | |/ / / /
| * | | | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2007-01-293-25/+250
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0jani@a88-113-38-195.elisa-laajakaista.fi2007-01-223-34/+256
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix for configure to detect library correctly.jani@a88-113-38-195.elisa-laajakaista.fi2007-01-222-52/+45
| | | * | | | Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010thek@kpdesk.mysql.com2007-01-092-10/+1
| | | |\ \ \ \
* | | | \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-01-311-2/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge mysql.com:/home/svoj/devel/bk/mysql-5.0svoj@mysql.com/april.(none)2007-01-251-2/+10
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2007-01-0312-11/+26
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG23526/mysql-5.0-engines2svoj@mysql.com/april.(none)2006-12-301-2/+10
| | |\ \ \ \ \ \ \
| | | * | | | | | | BUG#23526 - show table status reports incorrect values for MyISAM tablessvoj@mysql.com/april.(none)2006-12-051-2/+10
* | | | | | | | | | Reverting change adding /etc/mysql support, as it breaks some installs.mtaylor@qualinost.(none)2007-01-261-6/+4
|/ / / / / / / / /
* | | | | | | | | Merge recycle.(none):/src/bug22807/my50-bug22807iggy@recycle.(none)2007-01-191-15/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug#22807 mysql_upgrade fails when called with a basedir-path containing spacesiggy@recycle.(none)2007-01-191-15/+13
* | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttsmith@siva.hindu.god2007-01-181-0/+52
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge recycle.(none):/src/bug22807/my50-bug22807iggy@recycle.(none)2007-01-181-0/+52
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Bug#22807 mysql_upgrade fails when called with a basedir-path containing spacesiggy@recycle.(none)2007-01-181-0/+52
* | | | | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50tsmith@siva.hindu.god2007-01-181-0/+39
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-01-121-0/+39
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge mysql.com:/home/bkroot/mysql-5.0-rpllars@mysql.com/black.(none)2006-12-081-0/+39
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | BUG#24507 (rpl_log.test crash slave):rafal@quant.(none)2006-12-081-0/+39
| | | | |_|/ / / / / | | | |/| | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintcmiller@zippy.cornsilk.net2007-01-111-3/+4
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maintthek@kpdesk.mysql.com2007-01-111-5/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maintthek@kpdesk.mysql.com2007-01-112-10/+1
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010thek@kpdesk.mysql.com2007-01-112-10/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | / / | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | * | | | | | | Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628thek@kpdesk.mysql.com2007-01-092-10/+1
| | * | | | | | | | | Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maintthek@kpdesk.mysql.com2007-01-112-1/+10
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge naruto.:C:/cpp/bug24751/my41-bug24751Kristofer.Pettersson@naruto.2007-01-111-3/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Added support for /etc/mysql after /etc in the search path for my.cnfmtaylor@qualinost.(none)2006-12-151-0/+1
| * | | | | | | | | | | | Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maintthek@kpdesk.mysql.com2007-01-111-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maintthek@kpdesk.mysql.com2007-01-111-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |