summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge shellback.(none):/home/msvensson/mysql/work/my50-workmsvensson@shellback.(none)2006-09-151-8/+8
|\
| * 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 bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-301-3/+1
| |\ \
* | \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-09-081-6/+5
|\ \ \ \
| * \ \ \ 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
| * | | | | Fix bad manual merge.cmiller@zippy.cornsilk.net2006-09-051-4/+0
| * | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-1/+0
| |\ \ \ \ \
| | * | | | | mysqld.cc:rburnett@production.mysql.com2006-08-211-1/+0
| | * | | | | Merge production.mysql.com:/usersnfs/rburnett/tmp_mergerburnett@production.mysql.com2006-08-211-0/+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 zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-0/+4
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | mysqld --collation-server=xxx --character-set-server=yyybar@mysql.com/bar.intranet.mysql.r18.ru2006-08-111-2/+4
| | * | | | | | Bug#21419 test case lowercase_fs_off fails on Windowsmsvensson@neptunus.(none)2006-08-031-0/+5
| * | | | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51tsmith@maint2.mysql.com2006-09-041-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1tnurnberg@salvation.intern.azundris.com2006-08-281-27/+2
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintcmiller@zippy.cornsilk.net2006-08-231-1/+1
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintcmiller@zippy.cornsilk.net2006-08-141-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Bug#18875: Default value of tmp_table_size is meaninglesscmiller@zippy.cornsilk.net2006-08-111-1/+1
* | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1brian@zim.(none)2006-08-311-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Re'ordering of startup. Fixed Execution path issues. Added function for de'in...brian@zim.(none)2006-08-291-4/+3
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemergekostja@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
* | | | | | | | | | Cleanup of unused variables.brian@zim.(none)2006-08-251-8/+1
* | | | | | | | | | This changest:brian@zim.(none)2006-08-221-18/+0
* | | | | | | | | | This changeset moves the ha_myisam files to their storage directories. It al...brian@zim.(none)2006-08-191-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/tmp_regrburnett@bk-internal.mysql.com2006-08-171-3/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | 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 zim.(none):/home/brian/mysql/dep-5.1brian@zim.(none)2006-08-141-155/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintbrian@zim.(none)2006-08-101-155/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | This is the second patch for bdb removeal. This takes care of all options and...brian@zim.(none)2006-08-101-155/+2
* | | | | | | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-08-121-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | 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
| | | |/ / / | | |/| | |
* | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-mergekroki/tomash@moonlight.intranet2006-08-091-0/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bug#17599 The server doesn't give a warningpetr/cps@mysql.com/owlet.2006-07-201-0/+13
* | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/mrg50-ctsmith@maint1.mysql.com2006-08-031-2/+11
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
| | | |/ | | |/|
* | | | Make innodb_flush_log_at_trx_commit a settable global variable.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-291-2/+3
* | | | Make innodb_thread_concurrency 0 by default, and extendaivanov/alexi@mysql.com/mysqld.localdomain2006-07-291-2/+4
| |_|/ |/| |
* | | Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.(none)2006-07-101-3/+6
|\ \ \ | |/ /
| * | 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