summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Backport WL#4085: Merge revno:2476.657.219 from 6.0.Alexander Nozdrin2009-10-061-1/+0
* merge mysql-trunk-wl4444_4571 to mysql-wl3220-next-mrGeorgi Kodinov2009-09-2926-0/+1724
|\
| * Merge to mysql-next-mrMikael Ronstrom2009-09-28203-1000/+13124
| |\
| | * Merge from mysql-next-mr.Alexander Nozdrin2009-09-253-4/+66
| | |\
| | * \ merge mysql-next-mr-alikVladislav Vaintroub2009-09-2459-783/+7266
| | |\ \
| | * \ \ mergeVladislav Vaintroub2009-09-23142-217/+5763
| | |\ \ \
| | * | | | This is the downport ofVladislav Vaintroub2009-09-112-0/+33
| * | | | | WL#4444 Added TRUNCATE partition support, fixes bug#19405 and bug #35111Mikael Ronstrom2009-09-1024-0/+1691
| |/ / / /
* | | | | Ported WL#3220 to mysql-next-mr.Georgi Kodinov2009-09-284-12/+386
| |_|_|/ |/| | |
* | | | Merge from mysql-trunl-alik.Alexander Nozdrin2009-09-251-0/+1
|\ \ \ \
| * | | | Mark rpl.rpl_innodb_bug30888 experimental.Alexander Nozdrin2009-09-251-0/+1
* | | | | Merge from mysql-trunl-alik.Alexander Nozdrin2009-09-251-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Mark rpl.rpl_trigger experimental.Alexander Nozdrin2009-09-251-0/+1
* | | | | Merge from mysql-trunk-alik (stabilizing changes).Alexander Nozdrin2009-09-243-4/+64
|\ \ \ \ \ | |/ / / /
| * | | | Disable ndb and rpl_ndb test suites from regular tests.Alexander Nozdrin2009-09-241-0/+5
| * | | | Mark some tests experimental.Alexander Nozdrin2009-09-241-4/+54
| | |/ / | |/| |
* | | | Merge from mysql-next-mr.Alexander Nozdrin2009-09-244-4/+4
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Update disabled.def files.Alexander Nozdrin2009-09-234-4/+4
* | | Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr).Alexander Nozdrin2009-09-2359-783/+7266
|\ \ \ | |/ / |/| |
| * | Merge mysql-next-mr (revno 2882) --> mysql-trunk-signalMarc Alff2009-09-2255-98/+291
| |\ \
| * \ \ Merge mysql-next-mr (revno 2880) --> mysql-trunk-signalMarc Alff2009-09-202-5/+3
| |\ \ \
| * \ \ \ Merge mysql-trunk-mr (revno 2879) --> mysql-trunk-signalMarc Alff2009-09-181-0/+8
| |\ \ \ \
| * \ \ \ \ Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-1783-108/+5455
| |\ \ \ \ \
| * | | | | | Post merge fixesMarc Alff2009-09-1111-291/+210
| * | | | | | WL#2110 (SIGNAL)Marc Alff2009-09-1048-492/+7056
| | |_|_|_|/ | |/| | | |
* | | | | | merge from 5.1 of merge from 5.1-mtrBjorn Munch2009-09-222-11/+11
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 3rd merge from mainBjorn Munch2009-09-032-2/+4
| |\ \ \ \ \
| * \ \ \ \ \ mergeBjorn Munch2009-09-031-2/+2
| |\ \ \ \ \ \
| * | | | | | | A few suppression follow-upsBjorn Munch2009-09-034-0/+8
| * | | | | | | second merge from main, with adaptionsBjorn Munch2009-09-0263-198/+4925
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ first merge from mainBjorn Munch2009-09-02271-1982/+36877
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ merge from trunk-mtrBjorn Munch2009-09-2253-98/+278
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ new merge from trunkBjorn Munch2009-09-215-9/+18
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Update default.experimental.Alexander Nozdrin2009-09-201-2/+2
* | | | | | | | | | | Merge from mysql-trunk.Alexander Nozdrin2009-09-191-0/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mark some tests experimental.Alexander Nozdrin2009-09-191-0/+11
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge from mysql-5.1.Alexander Nozdrin2009-09-192-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge from mysql-5.1.38-releaseJonathan Perkin2009-09-032-2/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Apply patch from bug#46834 to install the test suite in RPMs.Jonathan Perkin2009-08-212-2/+4
* | | | | | | | | | Merge 5.1-bugteam -> trunk-alik (up to revno:3111).Alexander Nozdrin2009-09-182-5/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent tableSergey Glukhov2009-09-172-5/+3
| * | | | | | | | | Applying InnoDB snapshot 5.1-ss5282, Fixes BUG#44030Satya B2009-09-173-0/+47
| | | | * | | | | | tiny suppression fix: avoid /Bjorn Munch2009-09-211-1/+1
| | | | * | | | | | new merge from trunkBjorn Munch2009-09-1886-109/+5475
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "trunk-build" (including 5.4.2-beta) and "trunk".Joerg Bruehe2009-09-171-0/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge the changes done for 5.4.2-beta into "trunk".Joerg Bruehe2009-09-091-0/+8
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Make sure that variables which are (or may be) usedJoerg Bruehe2009-09-081-0/+8
* | | | | | | | | | Merge mysql-trunk -> mysql-trunk-bugfixing.Alexander Nozdrin2009-09-162-0/+143
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
* | | | | | | | | | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-1685-251/+5455
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | BUG#47016: rpl_do_grant fails on PB-2 with a failing connectLuis Soares2009-09-131-0/+3