summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ | | |/
| * | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159kroki/tomash@moonlight.intranet2006-11-211-0/+2
| |\ \
| | * | BUG#23159: prepared_stmt_count should be status variablekroki/tomash@moonlight.intranet2006-11-211-0/+2
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-281-5/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-201-5/+5
| |/ /
* | | Merge 192.168.0.4:mysql/bug22958/my50-bug22958msvensson@neptunus.(none)2006-11-171-0/+1
|\ \ \
| * | | Bug#22958 Com_create_user missing within 5.0msvensson@shellback.(none)2006-10-301-0/+1
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860cmiller@zippy.cornsilk.net2006-11-111-8/+19
|\ \ \ \ | |_|/ / |/| | |
| * | | Bug #22860: Option --memlock should be revisitedcmiller@zippy.cornsilk.net2006-11-101-8/+19
| | |/ | |/|
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1kostja@bodhi.local2006-11-021-9/+33
| |\ \
| * \ \ Merge bk-internal:/home/bk/mysql-4.1-maintjimw@rama.(none)2006-09-281-10/+11
| |\ \ \
| * \ \ \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfxtsmith@maint1.mysql.com2006-09-071-2/+2
| |\ \ \ \
* | \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2006-11-021-1/+9
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Improve comments around FLUSH STATUSmsvensson@shellback.(none)2006-10-301-1/+9
* | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915kroki/tomash@moonlight.intranet2006-10-301-9/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | BUG#21915: Changing limits of table_cache when setting max_connectionskroki/tomash@moonlight.intranet2006-10-301-9/+33
| |/ / /
| * | | mysqld --collation-server=xxx --character-set-server=yyybar@mysql.com/bar.intranet.mysql.r18.ru2006-08-111-2/+4
* | | | Merge rama.(none):/home/jimw/my/mysql-4.1-cleanjimw@rama.(none)2006-09-281-9/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug #2717: include/my_global.h mis-defines __attribute__jimw@rama.(none)2006-08-171-10/+11
| |/ /
| * | Bug#21419 test case lowercase_fs_off fails on Windowsmsvensson@neptunus.(none)2006-08-031-0/+5
* | | Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdownmsvensson@shellback.(none)2006-09-151-8/+8
* | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfxtsmith@maint1.mysql.com2006-09-071-2/+2
|\ \ \
| * \ \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfxtsmith@maint1.mysql.com2006-09-071-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Bug #21054: myisam_stats_method ignored in my.cnf and cmdlinetsmith@maint1.mysql.com2006-09-071-2/+2
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-301-3/+1
|\ \ \ \
| * \ \ \ Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimemalff/marcsql@weblab.(none)2006-08-221-3/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Bug#8153 (Stored procedure with subquery and continue handler, wrong result)malff/marcsql@weblab.(none)2006-08-021-3/+1
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.cornsilk.net2006-08-171-1/+1
|\ \ \ \ \
| * | | | | Bug #20968: incorrect DBUG_ENTER string in mysqld.cc network_init(void) functioniggy@rolltop.ignatz42.dyndns.org2006-08-031-1/+1
* | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-ktrburnett@production.mysql.com2006-08-041-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | lowercase_fs_off fails on windows because lower_case_file_system is not beingrburnett@production.mysql.com2006-08-041-3/+2
| |/ / / /
* | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-08-011-0/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix lowercase_fs_off problem on windows. This test should not be run if lower...msvensson@neptunus.(none)2006-07-311-0/+5
| |/ / /
* | | | Finish the merge of the patch for bug #15195 from 4.1 -> 5.0tsmith/tim@siva.hindu.god2006-07-201-0/+5
* | | | Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes neededtsmith/tim@siva.hindu.god2006-07-201-2/+6
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | --{skip-}merge option added which allows the user to disable merge engine andramil/ram@mysql.com/myoffice.izhnet.ru2006-07-141-2/+10
| |/
* | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-06-261-2/+4
|\ \
| * | Bug#15276: MySQL ignores collation-serverbar@mysql.com2006-06-231-2/+4
* | | Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"jani@ua141d10.elisa.omakaista.fi2006-06-211-10/+3
* | | Fix for Bug#18246 "compilation error with tcp_wrapper"jani@ua141d10.elisa.omakaista.fi2006-06-211-3/+3
|/ /
* | Merge april:devel/BitKeeper/mysql-5.0-enginessvoj@may.pils.ru2006-06-191-3/+4
|\ \
| * | BUG#12982 - LOAD DATA fails without any error for big files with bigsvoj@may.pils.ru2006-06-071-3/+4
* | | Bug#18235: assertion/crash when windows mysqld is ended with ctrl-ctnurnberg@mysql.com2006-05-311-1/+5
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-05-291-1/+2
|\ \ \