summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmergeunknown2007-12-141-139/+129
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-12-141-134/+114
| |\
| | * Doxygenization of comments.unknown2007-10-111-134/+114
| * | Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-baseunknown2007-11-271-4/+15
| |\ \
| | * \ Merge adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153unknown2007-11-211-2/+12
| | |\ \
| | | * \ Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153unknown2007-11-211-2/+12
| | | |\ \
| | | | * | Bug #31153 calling stored procedure crashes server if available memory is lowunknown2007-11-191-2/+12
| | * | | | Bug#28785 thread-handling not displayed properly in SHOW VARIABLESunknown2007-11-141-2/+3
| * | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2007-11-141-1/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-10-301-1/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Merge mysql.com:/home/bar/mysql-work/mysql-5.0-rplunknown2007-10-021-1/+0
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Bug#29675 collation_connection is defined twice for the same valueunknown2007-10-021-1/+0
| | | | |/
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-communityunknown2007-11-091-3/+7
|\ \ \ \ \ | |/ / / /
| * | | | Remove net_printf_error(). Do not talk to network directly inunknown2007-11-011-1/+5
| * | | | In ha_delete_table, use a standard mechanism to intercept the error messageunknown2007-10-301-1/+1
| * | | | Rename: query_error -> is_slave_error.unknown2007-10-201-1/+1
| |/ / /
* | | | Sundry changes to fix merge problems. Most of these are duplicatedunknown2007-10-311-3/+2
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmergeunknown2007-10-291-7/+26
|\ \ \ \ | |/ / /
| * | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2007-10-081-2/+2
| |\ \ \
| | * | | Change URLs.unknown2007-10-051-2/+2
| | * | | Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731unknown2007-10-021-6/+6
| | |\ \ \
| | | * \ \ Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_buffer_limitsunknown2007-10-021-3/+3
| | | |\ \ \
| | | | * | | Limit join_buffer_size, sort_buffer_size and myisam_sort_buffer_size to 4GB o...unknown2007-08-291-3/+3
| | | | | |/ | | | | |/|
| | * | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-09-151-1/+20
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731unknown2007-10-021-4/+4
| |\ \ \ \ \
| | * \ \ \ \ Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731unknown2007-10-021-3/+3
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge polly.(none):/home/kaa/src/maint/bug5731.old/my50-bug5731-read_buffer_sizeunknown2007-10-021-3/+3
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | This patch is a part of work on bug #5731 "key_buffer_size not properly restr...unknown2007-09-071-3/+3
| | * | | | | Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_b...unknown2007-09-031-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-09-151-1/+20
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge mysql.com:/home/tnurnberg/15327/50-15327unknown2007-09-151-1/+20
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug #15327: configure: --with-tcp-port option being partially ignoredunknown2007-09-131-1/+20
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationunknown2007-10-171-855/+650
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Post-merge fixesunknown2007-08-281-4/+5
| * | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-Xunknown2007-08-271-1/+7
| |\ \ \ \ \
| | * | | | | Bug #30389: connection_id() always return 0 in embedded serverunknown2007-08-271-0/+5
| | * | | | | portation fixes for bug 29536 and 29325 inunknown2007-08-271-2/+2
| | * | | | | recommit of Addendum to bug #29325 to 5.1.22 treeunknown2007-08-271-1/+7
| * | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.0-marvelunknown2007-08-211-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail"unknown2007-08-161-1/+1
| | * | | | | Merge olga.mysql.com:/home/igor/mysql-5.0unknown2007-08-041-1/+7
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-08-211-19/+33
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-08-141-19/+33
| | |\ \ \ \ \ \
| | | * | | | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarisunknown2007-08-131-19/+33
| * | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-08-111-0/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.1unknown2007-08-041-0/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | mysqld.cc:unknown2007-08-021-4/+3
| | | * | | | | | | Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysqlunknown2007-08-021-0/+7
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | / / / | | | | |_|_|/ / / | | | |/| | | | |
| | | | * | | | | Addendum to bug 29325unknown2007-08-021-1/+7
| | | | | |_|/ / | | | | |/| | |
| * | | | | | | Merge bk-internal:/home/bk/mysql-5.1-marvelunknown2007-08-031-19/+40
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
View Lorry Controller Status