summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* Merged with mysql-5.1 tree.Michael Widenius2009-04-251-3/+3
|\
| * auto-mergeIgnacio Galarza2009-03-171-2/+2
| |\
| * \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-3/+3
| |\ \
| | * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-102-5/+5
* | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-2/+2
|\ \ \ \
| * \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge into dev tree.Alexey Kopytov2009-02-101-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix for bug #21205: Different number of digits for float/double/real in --ps-...Alexey Kopytov2009-01-281-2/+2
| | | |/
| | | * Bug#37226 Explicit call of my_thread_init() on Windows for every new thread.Vladislav Vaintroub2008-09-011-1/+12
| | | * fixed warnings and compile errors from the fix for bug 26243unknown2008-03-291-1/+1
| | | * Merge amd64.(none):/src/mysql-5.0-bugteamunknown2008-03-281-4/+0
| | | |\
| | | | * Bug#26243 mysql command line crash after control-cunknown2008-03-281-4/+0
| | | * | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0unknown2008-03-181-5/+12
| | | |\ \ | | | | |/ | | | |/|
* | | | | Fix two missing DBUG_RETURN.unknown2009-04-211-1/+1
|/ / / /
* | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-103-4/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Merged 5.1 with maria 5.1Michael Widenius2008-10-103-44/+103
| |\ \ \
| * \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-283-26/+33
| |\ \ \ \
| * | | | | Fix for build failureunknown2008-02-191-1/+1
| * | | | | Fix for build failures. Putting back "#define bool BOOL" under Windowsunknown2008-02-191-1/+1
| * | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-2/+2
| |\ \ \ \ \
| * | | | | | Fixed compiler warnings in a lot of filesunknown2008-02-131-1/+0
| * | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-272-4/+4
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-162-4/+4
| | |\ \ \ \ \ \
| | | * | | | | | fixes for windows buildsunknown2007-12-131-2/+2
| | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-10-101-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Moved randomize and my_rnd under mysysunknown2007-10-091-1/+1
| | | * | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-10-081-1/+1
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-072-1/+2
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-272-1/+2
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-272-1/+2
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-282-1/+2
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-202-1/+2
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * | | | | | Maria - various fixes around durability of files:unknown2006-11-212-1/+2
* | | | | | | | | | | | | | | | Bug#38522: 5 seconds delay when closing application using embedded serverVladislav Vaintroub2008-12-041-3/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Bug#37226 Explicit call of my_thread_init() on Windows for every new thread.Vladislav Vaintroub2008-09-011-1/+12
* | | | | | | | | | | | | | | Bug#27430 "Crash in subquery code when in PS and table DDL changed afterunknown2008-05-202-43/+91
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-282-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-072-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-272-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-082-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-072-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-262-2/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-082-2/+2
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | Fixes to merge between 5.1-main and 5.1-marvelunknown2007-10-161-1/+1
| | | | | | | * | | | | | | | | | | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-1/+1
| | | | | | | | |_|/ / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1unknown2008-03-181-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Post-merge fixes for Bug 35103unknown2008-03-171-1/+1
| * | | | | | | | | | | | | | | | | | | Merge buzz.(none):/home/davi/mysql-5.0-runtimeunknown2008-03-171-5/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |