summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bug #59182 output of mysql-test-run.pl - mismatch between col names and actua...Bjorn Munch2011-01-122-6/+11
* Bug #59153 mysqltest produces a valgrind warning when the running test failsBjorn Munch2011-01-111-0/+7
* Bug #59216 mysql test suite can not run indiviual tests in engines/funcs suiteBjorn Munch2011-01-111-2/+5
* upmerge 58896,58900,59002Bjorn Munch2011-01-116-21/+73
|\
| * Bug #59002 Please make mtr print correct file and line number when tests failBjorn Munch2011-01-111-5/+29
| * Bug #58900 query_get_value crashes when result begins with dollar signBjorn Munch2011-01-113-4/+18
| * Bug #58896 MTR should recognise combinations as experimental without needing ...Bjorn Munch2011-01-113-3/+8
| * Bug #59002 Please make mtr print correct file and line number when tests failBjorn Munch2011-01-111-9/+18
* | Bug #58841 Generalise handling of plugins in MTR mysql-test-run.pl scriptBjorn Munch2011-01-119-156/+112
* | null upmergeBjorn Munch2011-01-100-0/+0
|\ \ | |/
| * merge from 5.1 mainBjorn Munch2011-01-1082-630/+1535
| |\
* | \ merge from 5.5 mainBjorn Munch2011-01-10143-1160/+3749
|\ \ \
| * \ \ 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
| | | * | | | | | | Bug#58912 InnoDB unnecessarily avoids update-in-place on column prefix indexesMarko Mäkelä2010-12-2110-42/+128
| | * | | | | | | | Bug #18274 - InnoDB auto_increment field reset on OPTIMIZE TABLESunny Bains2010-12-171-2/+2
| | * | | | | | | | Increment InnoDB version from 1.1.4 to 1.1.5 Vasil Dimov2010-12-161-1/+1
| | * | | | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2010-12-141-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /