summaryrefslogtreecommitdiff
path: root/mysql-test/lib
Commit message (Expand)AuthorAgeFilesLines
* Manual resolving for the following filesAndrei Elkin2009-12-011-9/+20
|\
| * merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-303-7/+20
| |\
| * | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-161-9/+20
* | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-11-123-9/+24
|\ \ \
| * \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-3/+0
| |\ \ \ | | | |/ | | |/|
| | * | Merge bug#47867 to 5.1-bugteamMagnus Blåudd2009-11-031-3/+0
| | |\ \
| | | * | Bug#47867 compiler warning _WIN32_WINNT macro redefinitionMagnus Blåudd2009-10-061-3/+0
| | * | | Merge of innodb-zip-ss6129 snapshot.Sergey Vojtovich2009-11-031-5/+1
| | |\ \ \
| | | * | | Clean-up after applying innodb-zip-ss6129 snapshot:Sergey Vojtovich2009-11-031-5/+1
| | * | | | Merge innodb-5.1-ss6129 to mysql-5.1-bugteam.Sergey Vojtovich2009-11-031-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Clean-ups after applying InnoDB snapshot 5.1-ss6129:Sergey Vojtovich2009-11-031-0/+2
| | | | |/ | | | |/|
| | * | | mergeVladislav Vaintroub2009-11-033-18/+61
| | |\ \ \ | | | |/ /
| | | * | merge 48149Bjorn Munch2009-10-201-0/+12
| | | |\ \
| | | * \ \ merge 48130 and 48133Bjorn Munch2009-10-191-0/+1
| | | |\ \ \
| | | * \ \ \ merge from 5.1 mainBjorn Munch2009-10-161-2/+8
| | | |\ \ \ \
| * | | \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+19
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-1/+19
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Bug #47423 mtr connects to wrong databaseVladislav Vaintroub2009-11-031-1/+19
| | | | |_|_|_|/ | | | |/| | | |
| * | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-233-6/+35
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ new merge from next-mrBjorn Munch2009-10-221-1/+19
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge from next-mrBjorn Munch2009-10-212-5/+5
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merge 48149Bjorn Munch2009-10-201-0/+12
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | merge 48130 and 48133 from 5.1Bjorn Munch2009-10-191-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| * | | | | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-223-6/+24
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-212-5/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-152-5/+5
* | | | | | | | | | | Additional change required for bug#46834, find the std_data directoryJonathan Perkin2009-11-031-2/+3
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Automerge from mysql-trunk.Alexander Nozdrin2009-10-233-6/+35
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ new merge from trunkBjorn Munch2009-10-221-1/+19
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | merge 48149Bjorn Munch2009-10-201-0/+12
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Bug #48149 MTR should automatically skip SSL tests if SSL not supportedBjorn Munch2009-10-191-0/+12
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | merge 48130 and 48133 from 5.1Bjorn Munch2009-10-191-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Bug #48130 Expected failures should not count towards max-test-failBjorn Munch2009-10-171-0/+1
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | merge from mtr-51Bjorn Munch2009-10-081-6/+22
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | Bug #46625 Pushbuild2: does not notice test failure in "Innodb Plugin" modeBjorn Munch2009-10-081-2/+2
| | * | | | | mergeVladislav Vaintroub2009-10-071-10/+24
| | |\ \ \ \ \
| | | * | | | | Bug #47383 let mysql-test-run.pl run innodb tests using the pluginBjorn Munch2009-10-021-10/+24
| | * | | | | | Bug #47731 mtr freezes for many seconds when process to be killed has already...Vladislav Vaintroub2009-09-301-6/+22
| | |/ / / / /
* | | | | | | Automerge from mysql-trunk.Alexander Nozdrin2009-10-221-1/+19
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-141-1/+19
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | merge of 47383 from 5.1-mtrBjorn Munch2009-10-061-10/+24
| | | |/ | | |/|
| | * | Applying InnoDB snapshot 5.1-ss5921, part 2. Fixes BUG#44369Satya B2009-10-051-0/+2
| | * | Applying InnoDB snapshot 5.1-ss5921, Part 1. Fixes BUG#46000Satya B2009-10-051-0/+2
| | * | Don't use the semicolon character as a argument separator as itDavi Arnaut2009-09-291-2/+4
| | * | Additional Fix for BUG#44030 - Error: (1500) Couldn't read the MAX(ID) autoinc Satya B2009-09-231-1/+0
| | * | automergeGeorgi Kodinov2009-09-188-25/+92
| | |\ \ | | | |/
| | | * 3rd merge from mainBjorn Munch2009-09-031-1/+2
| | | |\
| | | * \ mergeBjorn Munch2009-09-031-2/+2
| | | |\ \
| | | * \ \ first merge from mainBjorn Munch2009-09-022-11/+75
| | | |\ \ \
| | * | | | | Applying InnoDB snapshot 5.1-ss5282, Fixes BUG#44030Satya B2009-09-171-0/+1
| | | |/ / / | | |/| | |
View Lorry Controller Status