summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ported WL#3220 to mysql-next-mr.Georgi Kodinov2009-09-2814-880/+1618
* Merge from mysql-trunk (update default.conf).Alexander Nozdrin2009-09-251-1/+1
|\
| * Update default.confAlexander Nozdrin2009-09-251-1/+1
* | 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-244-5/+65
|\ \ | |/
| * Disable ndb and rpl_ndb test suites from regular tests.Alexander Nozdrin2009-09-241-0/+5
| * Mark some tests experimental.Alexander Nozdrin2009-09-242-5/+55
* | Merge from mysql-next-mr.Alexander Nozdrin2009-09-244-4/+4
|\ \
| * \ Merge from mysql-trunk.Alexander Nozdrin2009-09-234-4/+4
| |\ \ | | |/
| | * Update disabled.def files.Alexander Nozdrin2009-09-234-4/+4
* | | Ignore a new symbolic link.Alexander Nozdrin2009-09-231-0/+1
* | | Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr).Alexander Nozdrin2009-09-23132-1874/+10489
|\ \ \ | |/ / |/| |
| * | Merge mysql-next-mr (revno 2882) --> mysql-trunk-signalMarc Alff2009-09-2263-136/+414
| |\ \
| * \ \ Merge mysql-next-mr (revno 2880) --> mysql-trunk-signalMarc Alff2009-09-205-64/+110
| |\ \ \
| * \ \ \ Merge mysql-trunk-mr (revno 2879) --> mysql-trunk-signalMarc Alff2009-09-187-30/+40
| |\ \ \ \
| * | | | | fixed tree nameMarc Alff2009-09-171-1/+1
| * | | | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-17168-908/+6870
| |\ \ \ \ \
| * | | | | | Post merge fixesMarc Alff2009-09-1111-291/+210
| * | | | | | WL#2110 (SIGNAL)Marc Alff2009-09-10120-1571/+10263
* | | | | | | Update default.conf.Alexander Nozdrin2009-09-231-1/+1
* | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-09-235-13/+14
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge from mysql-trunk.Alexander Nozdrin2009-09-231-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Update default.conf.Alexander Nozdrin2009-09-231-1/+1
| | * | | | | | Update default.conf.Alexander Nozdrin2009-09-231-1/+1
| | * | | | | | Merge from mysql-trunk.Alexander Nozdrin2009-09-234-12/+13
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge from mysql-trunk.Alexander Nozdrin2009-09-2263-136/+414
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge trunk -> trunk-bugfixing.Alexander Nozdrin2009-09-1812-94/+150
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge from mysql-trunk-alik.Alexander Nozdrin2009-09-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Update version in configure.in.Alexander Nozdrin2009-09-231-1/+1
| * | | | | | | | | | Merge from mysql-trunk(-alik).Alexander Nozdrin2009-09-231-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge from mysql-5.1.Alexander Nozdrin2009-09-231-0/+1
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge from mysql-5.1.39-releaseJonathan Perkin2009-09-211-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Install mysqld.libJonathan Perkin2009-09-041-0/+1
| * | | | | | | | | | | | merge 5.1-mtr -> 5.1 -> trunkBjorn Munch2009-09-232-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | merge from 5.1 of merge from 5.1-mtrBjorn Munch2009-09-222-11/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | / / / / / | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | | * | | | | | | | merge from 5.1-mtrBjorn Munch2009-09-0353-126/+341
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ 3rd merge from mainBjorn Munch2009-09-039-20/+58
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | * | | | | | | | mergeBjorn Munch2009-09-031-2/+2
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | A few suppression follow-upsBjorn Munch2009-09-034-0/+8
| | | | * | | | | | | | | second merge from main, with adaptionsBjorn Munch2009-09-02145-1071/+6275
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ first merge from mainBjorn Munch2009-09-02913-4531/+259638
| | | | |\ \ \ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-09-2263-136/+414
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge from mysql-trunk.Alexander Nozdrin2009-09-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Update version.Alexander Nozdrin2009-09-221-1/+1
| * | | | | | | | | | | | | | merge from trunk (with trunk-mtr)Bjorn Munch2009-09-2262-135/+413
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | merge from trunk-mtrBjorn Munch2009-09-2255-126/+358
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ new merge from trunkBjorn Munch2009-09-2113-77/+167
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
View Lorry Controller Status