summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-221-2/+9
|\
| * Post-merge fix (related to bug 24200 changes)unknown2006-12-201-1/+3
| * Merge siva.hindu.god:/usr/home/tim/m/bk/50-buildunknown2006-12-201-1/+6
| |\
| | * Added innodb_rollback_on_timeout option to restore the 4.1 unknown2006-12-191-1/+6
| | * Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-12-041-5/+14
| | |\
| | | * Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2006-12-011-5/+12
| | | |\
| | | | * Fixed compiler warningsunknown2006-11-301-1/+1
| | | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-291-5/+5
| | | |\ \
| | * | \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-11-281-5/+5
| | |\ \ \ \ | | | | |/ / | | | |/| |
* | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-archunknown2006-12-081-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | WL# 3031unknown2006-12-011-0/+4
* | | | | | Use "sql_print_error" instead of "sql_print_warning" to get a betterunknown2006-12-051-4/+4
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2006-12-041-11/+25
|\ \ \ \ \ \
| * \ \ \ \ \ Merge 192.168.0.10:mysql/work/my51-workunknown2006-11-291-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix spelling error reported by Paulunknown2006-11-281-2/+2
| * | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.1unknown2006-11-291-6/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | raise max_connections default to avoid conflicts with apache max_childs setti...unknown2006-11-271-1/+3
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2006-11-231-5/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-11-171-0/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge 192.168.0.4:mysql/bug22958/my50-bug22958unknown2006-11-171-0/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug#22958 Com_create_user missing within 5.0unknown2006-10-301-0/+1
| * | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860unknown2006-11-111-8/+19
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860unknown2006-11-111-8/+19
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860unknown2006-11-111-8/+19
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Bug #22860: Option --memlock should be revisitedunknown2006-11-101-8/+19
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-301-13/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-291-4/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Increased heap max length to > 4G for 64 bit machines unknown2006-11-281-4/+11
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Added back sql-bench directory, so that one can more easily run benchmarks on...unknown2006-11-291-9/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-11-301-0/+12
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-291-11/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | Update after merge.unknown2006-11-211-1/+11
| * | | | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159unknown2006-11-211-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159unknown2006-11-211-0/+2
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | BUG#23159: prepared_stmt_count should be status variableunknown2006-11-211-0/+2
| | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-021-9/+33
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1-maintunknown2006-09-281-10/+11
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfxunknown2006-09-071-2/+2
| | | |\ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-11-281-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Removed compiler warningsunknown2006-11-271-1/+1
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2006-11-271-4/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed a LOT of compiler warningsunknown2006-11-271-1/+1
| | * | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-221-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Remove compiler warningsunknown2006-11-201-5/+5
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-021-1/+9
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | Added --debug-info to most clients to detect memory leaks in mysql-test-rununknown2006-11-211-1/+1
| * | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2006-11-161-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-10-171-1/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Changed several char* to LEX_STRING*.unknown2006-10-161-1/+2