summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Transferring a change from main 5.5 into the 5.5.17 build:Joerg Bruehe2011-09-3031-859/+367
* Transferring a change from main 5.5 into the 5.5.17 build:Joerg Bruehe2011-09-301-0/+15
* Fix the spec file: Files must not be mentioned twice in a "%files" list.Joerg Bruehe2011-09-281-2/+5
* Bug#11759349 -- Merge of patch from mysql-5.1.Ashish Agarwal2011-09-278-35/+40
|\
| * BUG#11759349 - 51655: CREATE TABLE IN MEMORY ENGINE DOESN'T STOREAshish Agarwal2011-09-278-35/+40
* | local mergeTor Didriksen2011-09-2612-92/+380
|\ \
| * \ null upmergeBjorn Munch2011-09-260-0/+0
| |\ \ | | |/
| | * merge from 5.1-mtrBjorn Munch2011-09-269-9/+150
| | |\
| * | \ merge from 5.5-mtrBjorn Munch2011-09-2612-92/+380
| |\ \ \
| | * | | Fixed test sys_vars.all_vars: innodb_large_prefix no longer missingBjorn Munch2011-09-261-2/+0
| | * | | null upmergeBjorn Munch2011-09-260-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | merge from 5.1 mainBjorn Munch2011-09-2648-568/+545
| | | |\ \ | | | | |/
| | * | | merge from 5.5 mainBjorn Munch2011-09-2678-420/+878
| | |\ \ \ | | |/ / / | |/| | |
| | * | | null upmergeBjorn Munch2011-09-200-0/+0
| | |\ \ \ | | | |/ /
| | | * | merge from 5.1 main minus merge jam pushesBjorn Munch2011-09-2013-83/+130
| | | |\ \
| | * | \ \ merge from 5.5 mainBjorn Munch2011-09-2046-986/+622
| | |\ \ \ \
| | * \ \ \ \ upmerge 12916194Bjorn Munch2011-09-191-0/+5
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Bug #12916194 MTR SHOULD CUT OFF ANALYSIS OF SERVER LOG IF THERE IS TOO MUCHBjorn Munch2011-09-191-0/+5
| | * | | | | Bug #12934729 MTR: ADD OPTION TO RUN BOOTSTRAP THROUGH DEBUGGERBjorn Munch2011-09-191-10/+35
| | * | | | | Some tests simplified after 12912120Bjorn Munch2011-09-152-17/+0
| | * | | | | upmerge 12793118,12912120Bjorn Munch2011-09-155-7/+65
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Test federated_plugin must have ps-protocol offBjorn Munch2011-09-151-0/+3
| | | * | | | Bug #12912120 MTR SHOULD EXPORT MYSQLD'S PATH TO TEST CASESBjorn Munch2011-09-141-0/+6
| | | * | | | Bug #12793118 MYSQLTEST: --ERROR AND --DISABLE_ABORT_ON_ERROR DO NOT WORK FOR...Bjorn Munch2011-09-143-7/+56
| | * | | | | Bug #11751927 42960: MTR2: NO MORE --STRESS PARAMETERS Bjorn Munch2011-09-153-5/+56
| | * | | | | Bug #12956584 - MYSQLTEST: --ENABLE_X OR --DISABLE_X APPLYING ONLY TO NEXT C...Bjorn Munch2011-09-151-3/+6
| | * | | | | Bug #12939555 MTR FINDS ALREADY COMPRESSED CORE WHEN LOOKING FOR CORE FILES A...Bjorn Munch2011-09-141-2/+3
| | * | | | | Bug #12956584 MYSQLTEST: --ENABLE_X OR --DISABLE_X APPLYING ONLY TO NEXT COMM...Bjorn Munch2011-09-143-39/+173
| | * | | | | upmerge test fix part of 11750417Bjorn Munch2011-09-053-9/+39
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug #11750417 40942: UNABLE TO INSTALL FEDERATED PLUGINBjorn Munch2011-09-056-2/+80
* | | | | | | Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORYTor Didriksen2011-09-262-3/+3
|/ / / / / /
* | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-261-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Bug#12963823 CRASH IN PURGE THREAD UNDER UNUSUAL CIRCUMSTANCESMarko Mäkelä2011-09-223-7/+15
| * | | | | Bug 12963823 - Crash in Purge thread under unusual circumstances.unknown2011-09-203-41/+154
| * | | | | Merge.Sergey Vojtovich2011-09-166-5/+82
| |\ \ \ \ \
| * \ \ \ \ \ Merge from mysql-5.1.59-releaseunknown2011-09-1537-515/+294
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | BUG#13001711Luis Soares2011-09-231-0/+1
|\ \ \ \ \ \ \
| * | | | | | | BUG#13001711: UNINITIALIZED VALUE IN MASTER_INFO::CLEAR_IN_MEMORY_INFO Luis Soares2011-09-201-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | mergeDaniel Fischer2011-09-231-5/+9
|\ \ \ \ \ \ \
| * | | | | | | Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORYTor Didriksen2011-09-211-5/+9
* | | | | | | | post-merge fixDaniel Fischer2011-09-211-3/+3
* | | | | | | | merge from 5.5.16Daniel Fischer2011-09-2174-373/+715
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | BUG#12929631 : Execute crashes with --verbose output (Windows) Chuck Bell2011-09-092-0/+3
| * | | | | | | add mysql_plugin man page to spec fileDaniel Fischer2011-09-081-0/+5
| * | | | | | | Merge with main prior to push for BUG#12929345.Chuck Bell2011-09-074-33/+61
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#12873214 WINDOWS AUTHENTICATION PLUGIN PRODUCES EXCESSIVE RECORDS IN SERV...Rafal Somla2011-09-074-33/+61
| * | | | | | | | BUG#12929345 : Execution aborts without any messages (Windows only)Chuck Bell2011-09-071-2/+2
| |/ / / / / / /
| * | | | | | | BUG#12929345 : Execution aborts without any messages (Windows only)Chuck Bell2011-09-071-3/+10
| * | | | | | | Merge with mainChuck Bell2011-09-071-17/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #12944747: MYSQL PROXY CAN'T DISTINGUISH WIN-AUTH DATA Georgi Kodinov2011-09-071-17/+6