summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge of changeset of WL#5945 from mysql-5.1.Nirbhay Choubey2011-10-1452-2989/+5373
|\
| * WL#5945 : Improve libedit libraryNirbhay Choubey2011-10-1452-2994/+5373
* | automergeSergey Glukhov2011-10-1216-424/+276
|\ \
| * \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-1216-424/+276
| |\ \ | | |/
| | * Bug#13006367 62487: innodb takes 3 minutes to clean up the adaptiveMarko Mäkelä2011-10-1217-386/+272
* | | Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULTSergey Glukhov2011-10-129-2/+109
|/ /
* | merge 5.1 -> 5.5Vinay Fisrekar2011-10-1232-11/+96
|\ \ | |/
| * bug#11766457 - adjusting/modifying the the tests as tests were failing if sys...Vinay Fisrekar2011-10-1232-11/+96
* | Test "file_contents" failed in non-community RPMs on SuSEJoerg Bruehe2011-10-101-6/+6
* | Bug#12912112 MYSQL_CLIENT_TEST FAILS ON TEST_TRUNCATION Magne Mahre2011-10-061-3/+7
* | null upmergeBjorn Munch2011-10-050-0/+0
|\ \ | |/
| * merge 5.1-mtr => 5.1Bjorn Munch2011-10-0520-70/+9
| |\
* | \ merge 5.5-mtr => 5.5Bjorn Munch2011-10-0531-130/+52
|\ \ \
| * | | Silly mistake in gdb output: replaced print with resfile_print,Bjorn Munch2011-10-051-2/+2
| * | | Bug #12844282 62075: MTR TESTS SHOULD NOT HAVE TO SAVE & RESET INNODB_FILE_FO...Bjorn Munch2011-10-0525-57/+5
| |\ \ \ | | | |/ | | |/|
| | * | backporting 11766169, fixing 13034450Bjorn Munch2011-10-031-2/+5
| | * | Bug #12844282 62075: MTR TESTS SHOULD NOT HAVE TO SAVE & RESET INNODB_FILE_FO...Bjorn Munch2011-09-2719-68/+4
| * | | mtr: print which suites are used, unless explicit test namesBjorn Munch2011-10-031-0/+1
| * | | mtr --help: add --boot-xxx and sort some debug optionsBjorn Munch2011-09-291-3/+6
| * | | removed some duplicate/redundant entries from .bzrignoreBjorn Munch2011-09-291-68/+0
| * | | Bug #12373393 PB2 SHOULD ALLOW TO CREATE COLLECTIONS AS SUPER SET OF EXISTING...Bjorn Munch2011-09-294-0/+38
* | | | automergeSergey Glukhov2011-10-050-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | automergeSergey Glukhov2011-10-054-0/+8
| |\ \ \
* | \ \ \ automergeSergey Glukhov2011-10-052-0/+4
|\ \ \ \ \
| * \ \ \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-052-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Add InnoDB UNIV_SYNC_DEBUG assertions to rw-lock code.Marko Mäkelä2011-10-054-0/+8
* | | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-10-055-3/+48
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Bug#11747970 34660: CRASH WHEN FEDERATED TABLE LOSES CONNECTION DURING INSERT...Sergey Glukhov2011-10-055-3/+48
| |/ / /
* | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-040-0/+0
|\ \ \ \ | |/ / /
| * | | Correct the ChangeLogMarko Mäkelä2011-10-041-3/+4
| * | | Merge to current mysql-5.1unknown2011-10-041-22/+51
| |\ \ \
* | \ \ \ Merge with current mysql-5.5unknown2011-10-041-27/+54
|\ \ \ \ \
| * \ \ \ \ Upmerge of a merge changeset - empty.Joerg Bruehe2011-10-040-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge to main.Joerg Bruehe2011-10-041-22/+51
| | |\ \ \ \
| * | \ \ \ \ Merge to main.Joerg Bruehe2011-10-041-27/+54
| |\ \ \ \ \ \
| | * \ \ \ \ \ Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED ...Joerg Bruehe2011-10-041-27/+54
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Fix bug#11886309: RPM UPGRADE OF MYSQL ADVANCED GPL TO MYSQL SERVER ADVANCED ...Joerg Bruehe2011-10-041-22/+51
* | | | | | | | Merge from mysql-5.1 to mysql-5.5unknown2011-10-042-3/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Bug#12980094 and Bug#13034534unknown2011-10-045-5/+20
| | |_|/ / / | |/| | | |
* | | | | | BUG#11758262 BUG#13043055:Rohit Kalhans2011-10-032-5/+25
* | | | | | Bug#13030056 62533: UNITTEST/MYSYS/MY_ATOMIC-T.C DOES NOTJon Olav Hauglid2011-10-031-1/+8
* | | | | | 12956584 followup fix for mysqltestBjorn Munch2011-09-301-7/+4
* | | | | | bug#bug11747416 post-push fixes to correct file name print out.Andrei Elkin2011-09-305-7/+12
* | | | | | Revert original fix for Bug 12612184 and the follow up fix forInaam Rana2011-09-3031-859/+367
* | | | | | BUG#11758262 BUG#13043055Rohit Kalhans2011-09-302-4/+6
* | | | | | Bug#12982926 CLIENT CAN OVERRIDE ZERO-LENGTH-ALLOCATE BUFFERRafal Somla2011-09-291-0/+15
* | | | | | Update the German error message translations (by Stefan Hinz)Marko Mäkelä2011-09-293-85/+127
* | | | | | Bug#11747416 : 32228 A disk full makes binary log corruptAndrei Elkin2011-09-298-27/+110
* | | | | | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE...Rohit Kalhans2011-09-2918-152/+294
* | | | | | Merge of fix for bug#11758062 from mysql-5.1.Raghav Kapoor2011-09-286-13/+13
|\ \ \ \ \ \ | |/ / / / /