summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-1167-816/+94
* Bug#47792 : Moving test out of disabled state since the problem is not seen a...Anitha Gopi2011-01-111-1/+0
* mergeMattias Jonsson2011-01-1014-4131/+1498
|\
| * mergeMattias Jonsson2011-01-109-12/+293
| |\
| * \ Manual merge from 5.1Mattias Jonsson2011-01-1012-4125/+1492
| |\ \
| | * \ mergeMattias Jonsson2011-01-1012-4125/+1477
| | |\ \
| | | * \ mergeMattias Jonsson2011-01-101-1/+1
| | | |\ \
| | | | * | Bug#56380: valgrind memory leak warning from partition testsMattias Jonsson2010-12-011-1/+1
| | | * | | mergeMattias Jonsson2011-01-0411-4124/+1476
| | | |\ \ \
| | | | * | | Bug#54483: valgrind errors when making warnings forMattias Jonsson2010-12-224-23/+24
| | | | * | | Bug#54483: valgrind errors when making warnings for multiline inserts into pa...Mattias Jonsson2010-12-2211-4120/+1471
* | | | | | | The fix for Bug#58414 affecting the test show_check is pushed.Matthias Leich2011-01-101-1/+0
| |_|_|_|_|/ |/| | | | |
* | | | | | Bug#51631 general-log flag doesn't accept "on" as a value inMagne Mahre2011-01-101-1/+19
* | | | | | Bug #58933 Assertion `thd- >is_error()' fails on shutdown with ongoingJon Olav Hauglid2011-01-103-2/+67
* | | | | | Bug#58970 Problem Subquery (without referencing a table) Magne Mahre2011-01-103-1/+40
* | | | | | Bug#57986 ORDER BY clause is not used after a UNION, Magne Mahre2011-01-103-2/+161
|/ / / / /
* | | | | Merge mysql-5.1 -> mysql-5.5 (empty)Vasil Dimov2011-01-080-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-01-0839-404/+609
| |\ \ \ \
* | \ \ \ \ Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-01-0859-767/+1850
|\ \ \ \ \ \
| * \ \ \ \ \ Null merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-01-080-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Increment InnoDB Plugin version from 1.0.14 to 1.0.15.Vasil Dimov2011-01-081-1/+1
| * | | | | | Null merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-01-070-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Followup to vasil.dimov@oracle.com-20110107091222-q23qpb5skev0j9gcVasil Dimov2011-01-071-12/+15
| * | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodb (empty)Vasil Dimov2011-01-070-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-01-07363-3409/+4408
| | |\ \ \ \ \
| * | | | | | | Fix InnoDB style after mikael@dator8-20101217205840-i7ltx8m6z3uc42khVasil Dimov2011-01-071-4/+4
| * | | | | | | Merge mysql-5.5 -> mysql-5.5-innodbVasil Dimov2011-01-07362-3119/+5007
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-01-070-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fix Bug#59327 Fix autoconf usage for innodb_pluginVasil Dimov2011-01-071-10/+14
| * | | | | | | | merge from mysql-5.1-innodb to mysql-5.5-innodbJimmy Yang2011-01-063-3/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix Bug #55397 cannot select from innodb_trx when trx_query contains blobsJimmy Yang2011-01-064-3/+19
| * | | | | | | | Fix Bug #58653 - Sporadic crash due to assertion failure 0 == space->n_pendin...Sunny Bains2011-01-063-0/+57
| * | | | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-01-066-7/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | (InnoDB Plugin) Fix Bug#59303 Correct URL in crash messageVasil Dimov2011-01-066-7/+7
| * | | | | | | | Null merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-01-060-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | (Builtin InnoDB) Fix Bug#59303 Correct URL in crash messageVasil Dimov2011-01-067-9/+9
| * | | | | | | | merge from mysql-5.1-innodb to mysql-5.5-innodbJimmy Yang2011-01-051-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix Bug #59197 double quote in field comment prevents foreign keyJimmy Yang2011-01-043-2/+7
| | * | | | | | | Fix Bug #59157 valgrind conditional jump warning from dict_load_foreign.Jimmy Yang2011-01-041-0/+2
| * | | | | | | | null merge from mysql-5.1-innodbunknown2011-01-040-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 43818 - Patch for mysql-5.1-innodbunknown2011-01-041-9/+11
| * | | | | | | | PS-instrument the array of latches (rw locks) dict_table_stats_latches[].Vasil Dimov2011-01-043-2/+5
| * | | | | | | | Merge: mysql-5.1-innodb --> mysql-5.5-innodbCalvin Sun2010-12-270-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix a build error on Windows, introduced by revision-id:Calvin Sun2010-12-271-2/+2
| * | | | | | | | Fix a build error on Windows, introduced by revision-id:Calvin Sun2010-12-271-2/+2
| * | | | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodb (empty)Vasil Dimov2010-12-270-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-12-27827-6388/+9187
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge mysql-5.5-bugteam -> mysql-5.5-innodbVasil Dimov2010-12-271287-333544/+10847
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2010-12-2110-259/+340
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Bug #55284 Double BLOB free due to lock wait while updating PRIMARY KEYMarko Mäkelä2010-12-216-213/+228