summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* perror.c:unknown2008-03-281-0/+1
* Makefile.am:unknown2008-03-281-1/+1
* Fixed problem with non-synchronous error listsunknown2008-03-285-94/+120
* fixed compiler error in 5.1-marvel.unknown2008-03-281-1/+0
* fixed a hand in 5.1-marvel : unknown2008-03-281-5/+0
* Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-2892-450/+912
|\
| * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-2693-449/+918
| |\
| | * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-13121-726/+2058
| | |\
| | * \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-0793-449/+918
| | |\ \
| | | * \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-2793-449/+918
| | | |\ \
| | | | * | Reverted wrong patch, fix for Windows 32bit build.unknown2008-02-262-2/+6
| | | | * | Fixed a test.unknown2008-02-203-7/+8
| | | | * | Added a missing cast.unknown2008-02-181-1/+1
| | | | * | Fixed a previous patch.unknown2008-02-184-26/+15
| | | | * | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-1589-422/+898
| | | | |\ \
| | | | | * \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-1262-1452/+3463
| | | | | |\ \
| | | | | * | | Removed extra symbol during merge.unknown2008-02-121-1/+0
| | | | | * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-0889-420/+897
| | | | | |\ \ \
| | | | | | * | | Mutex protection added for loading plugins. (BUG#33345)unknown2007-12-191-0/+3
| | | | | | * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-0791-419/+969
| | | | | | |\ \ \
| | | | | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-2691-422/+971
| | | | | | | |\ \ \
| | | | | | | | * | | Fixed a wrong regexp in mysql-test-run.unknown2007-11-141-3/+3
| | | | | | | | * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-1455-121/+1273
| | | | | | | | |\ \ \
| | | | | | | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-122-0/+2
| | | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-0890-420/+969
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * | | | | Fixed problem in my_micro_time_and_time().unknown2007-11-081-2/+9
| | | | | | | | | * | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-0890-418/+960
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * | | | | Fixed a typo.unknown2007-10-301-2/+2
| | | | | | | | | | * | | | | Fix for counting query time for Windows.unknown2007-10-291-17/+23
| | | | | | | | | | * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-10-161-1/+1
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * | | | | Fixes to merge between 5.1-main and 5.1-marvelunknown2007-10-163-8/+10
| | | | | | | | | | * | | | | | Fixes to merge between 5.1-main and 5.1-marvelunknown2007-10-154-7/+11
| | | | | | | | | | |/ / / / /
| | | | | | | | | | * | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-1178-386/+844
| | | | | | | | | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-10-0710-8/+82
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-10-0110-8/+82
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | * | | | | Removed extra spacesunknown2007-10-0110-8/+82
* | | | | | | | | | | | | | | | | Merge mysql.com:/misc/mysql/mysql-5.0-optunknown2008-03-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/misc/mysql/mysql-5.0unknown2008-03-2735-55/+291
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/misc/mysql/mysql-5.1unknown2008-03-2749-331/+453
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge host.loc:/home/uchum/work/5.0-optunknown2008-03-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge host.loc:/home/uchum/work/mysql-5.0unknown2008-03-2735-55/+291
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge host.loc:/home/uchum/work/5.0-optunknown2008-03-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge host.loc:/home/uchum/work/4.1-optunknown2008-03-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge host.loc:/home/uchum/work/mysql-5.0unknown2008-03-2735-55/+291
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge host.loc:/home/uchum/work/mysql-5.1unknown2008-03-2749-331/+453
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | view.result:unknown2008-03-271-2/+2
| | * | | | | | | | | | | | | | | | | | | | | | Merge host.loc:/home/uchum/work/5.0-optunknown2008-03-273-0/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge host.loc:/home/uchum/work/5.0-opt-35193unknown2008-03-273-0/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | Fixed bug #35193.unknown2008-03-263-0/+49
| | * | | | | | | | | | | | | | | | | | | | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2008-03-253-0/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \