summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2007-04-031-3/+12
|\
| * mysqld.cc:dfischer/mysqldev@mysql.com/production.mysql.com2007-03-011-1/+1
| * Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-re...cmiller@zippy.cornsilk.net2007-02-271-3/+12
| |\
| | * Prevent bugs by making DBUG_* expressions syntactically equivalent cmiller@zippy.cornsilk.net2007-02-221-1/+8
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communitycmiller@zippy.cornsilk.net2007-01-181-2/+4
| | |\
| | | * Bug#24822: Patch: uptime_since_flush_statuscmiller@zippy.cornsilk.net2007-01-181-2/+4
* | | | Fix for bug #25966 "2MB per second endless memory consumption after LOCKdlenev@mockturtle.local2007-03-151-0/+6
* | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-081-12/+8
|\ \ \ \
| * \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50tsmith@quadxeon.mysql.com2007-03-071-12/+0
| |\ \ \ \
| | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimekostja@bodhi.local2007-03-071-12/+0
| | |\ \ \ \
| | | * | | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-reviewkostja@bodhi.local2007-03-071-12/+0
| * | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimetsmith@quadxeon.mysql.com2007-03-071-0/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2007-03-061-0/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Bug#8407 (Stored functions/triggers ignore exception handler)malff/marcsql@weblab.(none)2007-03-051-0/+8
* | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781msvensson@pilot.blaudden2007-03-051-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add "have_ssl" as synonym for "have_openssl"msvensson@pilot.blaudden2007-03-051-5/+5
* | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0msvensson@pilot.blaudden2007-03-011-39/+94
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Fixes of compilation warnings and errors.rafal@quant.(none)2007-03-011-1/+1
| * | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2007-02-251-1/+26
| |\ \ \ \ \
| | * \ \ \ \ Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145h.mysql.com2007-02-241-1/+26
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Backport from the Falcon tree.guilhem@gbichot3.local2007-02-151-1/+1
| | | * | | | Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rplcbell/Chuck@mysql_cab_desk.2007-01-181-0/+25
| | | |\ \ \ \
| | | | * | | | BUG#21490 - No warning issued for deprecated replication parameterscbell/Chuck@mysql_cab_desk.2007-01-181-0/+25
| * | | | | | | 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 pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166msvensson@pilot.blaudden2007-02-281-1/+10
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.blaudden2007-02-281-1/+10
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" er...msvensson@pilot.blaudden2007-02-281-1/+10
| | * | | | | | | | | | Merge 192.168.0.10:mysql/mysql-4.1-maintmsvensson@pilot.mysql.com2007-02-061-8/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintcmiller@zippy.cornsilk.net2007-01-311-8/+3
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-01-311-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166msvensson@pilot.blaudden2007-02-271-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bug#20166 mysql-test-run.pl does not test system privilege tables creationmsvensson@pilot.blaudden2007-02-201-4/+10
* | | | | | | | | | | | | | | Merge polly.local:/tmp/maint/bug25137/my50-bug25137kaa@polly.local2007-02-201-4/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bug#18743: Several test cases fails if "classic" configuration in 5.0kaa@polly.local2007-02-191-4/+27
* | | | | | | | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628msvensson@pilot.mysql.com2007-02-141-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bug#18628 mysql-test-run: security problem(part1)msvensson@pilot.mysql.com2007-02-141-1/+19
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /