summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Expand)AuthorAgeFilesLines
* WL #3337 (Event scheduler new architecture)andrey@lmy004.2006-07-041-1/+1
* Mergeandrey@lmy004.2006-06-281-4/+4
|\
| * WL#3337 (Events new architecture)andrey@lmy004.2006-06-281-4/+4
| * WL#3337 (Events new architecture)andrey@lmy004.2006-06-281-1/+1
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1konstantin@mysql.com2006-06-261-1/+1
|\ \ | |/
| * Merge mysql.com:/mnt/raid/alik/MySQL/devel/5.1-treeanozdrin@alik.2006-06-221-1/+1
| |\
| | * manual mergeandrey@lmy004.2006-06-201-1/+1
| | |\
| | | * Reorganize, physically the events codeandrey@lmy004.2006-06-081-1/+1
* | | | Merge mysql.com:/home/emurphy/src/bk-clean/tmp_mergeelliot@mysql.com2006-06-251-13/+6
|\ \ \ \
| * | | | 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#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 mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2knielsen@rt.int.sifira.dk2006-06-231-1/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | BUG#20598knielsen@mysql.com2006-06-211-1/+1
| * | | | | | | | | Fix a Valgrind leak error report for not freed binlog injector singleton.knielsen@mysql.com2006-06-191-0/+7
* | | | | | | | | | Remove compiler warningsmonty@mysql.com2006-06-231-3/+4
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1rburnett@bk-internal.mysql.com2006-06-201-3/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | 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
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1rburnett@bk-internal.mysql.com2006-06-191-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimepetr@outpost.site2006-06-151-3/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimepetr@mysql.com2006-06-071-3/+3
| | |\ \ \ \ \
| | | * | | | | WL#3153 "Split logs". Recommit with post-review fixespetr@mysql.com2006-05-051-3/+3
* | | | | | | | after merge fixgluh@mysql.com2006-06-191-7/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | WL#3015: Logging Improvements - No Restarts(ver N4)gluh@eagle.intranet.mysql.r18.ru2006-06-191-7/+31
* | | | | | | | Fixed typo in variable namemskold@mysql.com2006-06-151-1/+1
* | | | | | | | Merge xiphis.org:/home/antony/work2/p2-bug20168.2acurtis@xiphis.org2006-06-141-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Bug#20168acurtis@xiphis.org2006-06-131-2/+3
| |/ / / / / / /
* | | | | | | | Fixed variable descriptionmskold@mysql.com2006-06-141-1/+1
* | | | | | | | Fixed incorrect handling of renamed fields, forcing copy of table if needed a...mskold@mysql.com2006-06-131-0/+7
|/ / / / / / /
* | | | | | | Re-apply missing changeset, orignally pushed by elliotmonty@mysql.com2006-06-061-2/+7
* | | | | | | After merge fixesmonty@mysql.com2006-06-051-1/+1
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-06-041-5/+6
|\ \ \ \ \ \ \
| * | | | | | | This changeset is largely a handler cleanup changeset (WL#3281), but includes...monty@mysql.com2006-06-041-5/+6
* | | | | | | | Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-newelliot@mysql.com2006-06-011-5/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newjani@ua141d10.elisa.omakaista.fi2006-06-011-5/+5
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newjani@ua141d10.elisa.omakaista.fi2006-05-311-8/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-05-301-5/+5
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | 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
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
* | | | | | | | | | | Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-newelliot@mysql.com2006-06-011-33/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newserg@sergbook.mysql.com2006-05-311-8/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |