summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* Re-apply missing changeset, orignally pushed by elliotunknown2006-06-061-2/+7
* After merge fixesunknown2006-06-051-1/+1
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-06-041-5/+6
|\
| * This changeset is largely a handler cleanup changeset (WL#3281), but includes...unknown2006-06-041-5/+6
* | Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-06-011-5/+5
|\ \
| * \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-06-011-5/+5
| |\ \
| | * \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-311-8/+0
| | |\ \
| | * \ \ Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0unknown2006-05-301-5/+5
| | |\ \ \
| | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-261-1/+2
| | | |\ \ \
| | | | * | | BUG#19322 Added help defintion for --skip-external locking to mysqld --help -...unknown2006-05-191-1/+2
| | | * | | | Merge monty@192.168.0.9:/my/mysql-5.0unknown2006-05-241-4/+4
| | | |\ \ \ \
| | | | * | | | More DBUG statementsunknown2006-05-241-4/+4
| | | * | | | | Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711unknown2006-05-231-1/+14
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
* | | | | | | | Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-06-011-33/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-311-8/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge gbichot@bk-internal:/home/bk/mysql-5.1-newunknown2006-05-301-8/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge bk://localhost:5556unknown2006-05-171-8/+0
| | | |\ \ \ \ \
| | | | * | | | | Removing the binlog-show-xid option as it was only a temporary solution until...unknown2006-05-171-8/+0
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-301-1/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-281-25/+27
| |\ \ \ \ \ \ \ \
| | * | | | | | | | handlerton cleanup:unknown2006-05-281-25/+27
| | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-301-1/+14
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-05-291-1/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711unknown2006-05-231-1/+14
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Add comment for 'kill_server' functionunknown2006-05-231-1/+14
* | | | | | | | | Merge mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-releaseunknown2006-05-261-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | BUG#15868 InnoDB thread thrashingunknown2006-05-261-1/+1
| |/ / / / / / /
* | | | | | | | Removed wrong ascii codes from source code.unknown2006-05-231-1/+1
|/ / / / / / /
* | | | | | | various fixes after push of fix for bug#17619unknown2006-05-231-1/+4
* | | | | | | manual mergedunknown2006-05-221-8/+28
|\ \ \ \ \ \ \
| * | | | | | | fix for bug #17619 Scheduler race conditionsunknown2006-05-221-8/+28
* | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanunknown2006-05-191-2/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-1039unknown2006-05-191-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #1039: tmpdir and datadir not available via @@ system variable syntaxunknown2006-05-081-1/+2
| * | | | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-191-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711unknown2006-05-191-1/+2
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Bug#15869 Cannot shutdown the server - it restartsunknown2006-05-191-1/+2
| * | | | | | | | Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixunknown2006-05-151-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Fix "glibc detected double free"unknown2006-05-181-1/+0
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-05-171-0/+4
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixunknown2006-05-161-0/+4
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix two Valgrind memory leak warnings.unknown2006-05-151-0/+4
* | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-161-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-151-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Mergeunknown2006-05-121-49/+56
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge bk@192.168.21.1:mysql-5.1-newunknown2006-04-271-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | bug #18518 (embedded server crashes starting)unknown2006-04-241-1/+1
* | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-121-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_mergeunknown2006-05-121-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0unknown2006-05-091-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /