summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge from mysql-next-mr-alik (WL#4085).Alexander Nozdrin2009-10-0925-2078/+0
|\
| * Merge from mysql-next-mr.Alexander Nozdrin2009-10-0921-594/+480
| |\
| * | Merge revno:2617.31.54 from 6.0.Alexander Nozdrin2009-10-0624-2077/+0
| * | Backport WL#4085: Merge revno:2476.657.219 from 6.0.Alexander Nozdrin2009-10-061-1/+0
* | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-0921-594/+480
|\ \ \ | | |/ | |/|
| * | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-091-0/+1
| |\ \
| | * | Mark main.log_tables experimental (Bug 47924).Alexander Nozdrin2009-10-081-0/+1
| * | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-081-326/+0
| |\ \ \ | | |/ /
| | * | Fix index_merge_innodb.result (Bug 45727).Alexander Nozdrin2009-10-081-326/+0
| * | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-071-6/+2
| |\ \ \ | | |/ /
| | * | Disabled index_merge2.inc due to Bug 45727.Alexander Nozdrin2009-10-071-6/+2
| * | | Backport of the fix for BUG#33730 "Full table scan instead selected partition...Guilhem Bichot2009-10-053-1/+39
| * | | Port of fix for BUG#42893 "main.information_schema times out sporadically"Guilhem Bichot2009-10-054-123/+141
| * | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-021-0/+2
| |\ \ \ | | |/ /
| | * | Made two test cases experimental.Alexander Nozdrin2009-10-021-0/+2
| * | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-011-1/+7
| |\ \ \ | | |/ /
| | * | 1. Respect experimental tag in gcov mode;Alexander Nozdrin2009-10-011-1/+7
| * | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-014-12/+386
| |\ \ \ | | | |/ | | |/|
| * | | auto-mergeIngo Struewing2009-09-309-134/+283
| |\ \ \
| | * | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-309-134/+283
| * | | | Bug#37267 - connect() EINPROGRESS failures mishandled in client libraryIngo Struewing2009-09-302-3/+5
| |/ / /
* | | | Bsckporting WL#3764 Sinhala CollationAlexander Barkov2009-10-062-0/+131
* | | | Backporting WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMATAlexander Barkov2009-10-064-7/+90
* | | | WL#4584 Internationalized number formatAlexander Barkov2009-10-053-3/+175
| |/ / |/| |
* | | 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
| |\ \ \ \ \