summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-221-2/+2
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-36/+66
|\
| * Avoid compiler warnings on powermacg5monty@mysql.com/narttu.mysql.fi2007-01-231-1/+1
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-35/+65
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-12-151-35/+65
| | |\
| | | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-35/+65
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2007-02-061-15/+19
|\ \ \ \
| * \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2007-02-021-0/+4
| |\ \ \ \
| | * | | | After merge fixistruewing@chilla.local2007-02-021-0/+4
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1istruewing@chilla.local2007-02-011-0/+3
| | |\ \ \ \
| | | * | | | Valgrind error fixesgluh@mysql.com/eagle.(none)2007-02-011-0/+3
| * | | | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2007-02-011-25/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge chilla.local:/home/mydev/mysql-4.0-axmrgistruewing@chilla.local2007-02-011-25/+9
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Cleanup of thread-type (linuxthread or NTPL) detection codejani@ua141d10.elisa.omakaista.fi2007-01-251-25/+9
| * | | | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2007-01-291-15/+31
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0jani@a88-113-38-195.elisa-laajakaista.fi2007-01-221-15/+31
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix for configure to detect library correctly.jani@a88-113-38-195.elisa-laajakaista.fi2007-01-221-19/+34
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-01-311-2/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optsergefp@mysql.com2007-01-251-0/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optsergefp@mysql.com2007-01-241-0/+3
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | BUG#24127: (a,b) IN (SELECT c,d ...) can produce wrong results if a and/or b ...sergefp@mysql.com2007-01-121-0/+3
| * | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0tomas@poseidon.mysql.com2007-01-241-2/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@mysql.com/linux.site2007-01-031-2/+13
| | |\ \ \ \ \ \
| | | * | | | | | Added --ndb-use-transactionsmskold/marty@mysql.com/linux.site2007-01-021-2/+13
* | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-01-311-0/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/home/ram/work/b19690/b19690.4.1ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-01-311-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | fix for bug #19690: ORDER BY eliminates rows from the resultramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-01-311-0/+1
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943msvensson@pilot.mysql.com2007-01-291-8/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Bug#22943 syscall pruning in libmysqlmsvensson@pilot.mysql.com2007-01-291-8/+2
| |/ / / / / / /
* | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50tsmith@siva.hindu.god2007-01-181-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable symlinks under valgrind builds (again), with a comment.kostja@bodhi.local2007-01-171-2/+13
| * | | | | | | | Fix a ps.test failure in 5.0-runtime tree.kostja@bodhi.local2007-01-171-8/+2
* | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0msvensson@pilot.mysql.com2007-01-171-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@mysql.com/eagle.(none)2007-01-121-0/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/hfmain.(none)2007-01-111-2/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-optgluh@mysql.com/eagle.(none)2007-01-101-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Fix for bug#20867 InnoDB Bug - create temporary table+crash => mysqld needs t...gluh@mysql.com/eagle.(none)2007-01-101-1/+1
| | * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-12-041-0/+2
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-01-111-2/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sagemmj@tiger.mmj.dk2007-01-111-0/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | WL #3670: Compile-time option to remove GRANT-related startup optionstsmith@siva.hindu.god2007-01-091-0/+6
| * | | | | | | | | mysqld.cc, configure.in:kent@mysql.com/kent-amd64.(none)2007-01-011-2/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Bug#23950: misplaced code in mysqld.cc, main()cmiller@zippy.cornsilk.net2007-01-021-1/+3
|/ / / / / / / /
* | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
|/ / / / / / /
* | | | | | | Added innodb_rollback_on_timeout option to restore the 4.1 tsmith/tim@siva.hindu.god2006-12-191-1/+6
| |_|_|_|/ / |/| | | | |
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-041-5/+14
|\ \ \ \ \ \
| * \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marveldf@kahlann.erinye.com2006-12-011-5/+12
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2006-11-301-1/+1
| | * | | | | Increased heap max length to > 4G for 64 bit machines monty@mysql.com/nosik.monty.fi2006-11-281-4/+11
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-11-291-5/+5
| |\ \ \ \ \ \ | | |/ / / / /