summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * \ \ Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-05-291-1/+2
| |\ \ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintelliot@mysql.com2006-05-241-1/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicatedelliot@mysql.com2006-04-281-1/+2
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0elliot@mysql.com2006-05-261-1/+2
|\ \ \ \ \
| * | | | | BUG#19322 Added help defintion for --skip-external locking to mysqld --help -...iggy@mysql.com2006-05-191-1/+2
* | | | | | Merge monty@192.168.0.9:/my/mysql-5.0monty@mysql.com2006-05-241-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | More DBUG statementsmonty@mysql.com2006-05-241-4/+4
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711msvensson@neptunus.(none)2006-05-231-1/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Add comment for 'kill_server' functionmsvensson@neptunus.(none)2006-05-231-1/+14
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-1039jimw@mysql.com2006-05-191-1/+2
|\ \ \ \ \
| * | | | | Bug #1039: tmpdir and datadir not available via @@ system variable syntaxjimw@mysql.com2006-05-081-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2006-05-191-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711msvensson@neptunus.(none)2006-05-191-1/+2
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | Bug#15869 Cannot shutdown the server - it restartsmsvensson@neptunus.(none)2006-05-191-1/+2
* | | | Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixknielsen@mysql.com2006-05-151-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix two Valgrind memory leak warnings.knielsen@mysql.com2006-05-151-0/+4
* | | | Remove valgrind and compiler warningsmsvensson@neptunus.(none)2006-05-081-0/+2
* | | | Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208msvensson@neptunus.(none)2006-04-261-2/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-04-121-2/+5
| |\ \ \ | | |/ / | |/| |
| | * | Cleanup SSL implementationmsvensson@neptunus.(none)2006-03-101-2/+5
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-04-181-1/+6
|\ \ \ \
| * | | | Bug#18564 Test failure due to test not checking preconditionsmsvensson@neptunus.(none)2006-04-121-1/+6
| |/ / /
* | | | Merge april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1svoj@april.(none)2006-04-151-1/+1
|\ \ \ \ | | |_|/ | |/| |