summaryrefslogtreecommitdiff
path: root/.bzr-mysql
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-161-1/+1
|\
| * Update version in mysql-next-mr.Alexander Nozdrin2009-12-161-1/+1
* | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-1/+1
|\ \ | |/
| * Update version tag (new: 5.6).Alexander Nozdrin2009-11-121-1/+1
* | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-1/+1
|\ \ | |/
| * Fix default.conf.Alexander Nozdrin2009-10-271-1/+1
| * manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-1/+1
| |\
| | * Fixed tree_name: mysql-5.1 --> mysql-5.1-rep+2Luis Soares2009-09-291-1/+1
| * | Merge from mysql-trunk.Alexander Nozdrin2009-10-231-1/+1
| |\ \
| | * | Fix default.conf.Alexander Nozdrin2009-10-231-1/+1
| * | | null merge from trunk-mtrBjorn Munch2009-09-231-1/+1
| |\ \ \ | | |/ /
| | * | new merge from trunkBjorn Munch2009-09-181-1/+1
| | |\ \
| | * \ \ initial merge from 5.1-mtrBjorn Munch2009-09-041-1/+1
| | |\ \ \
| | | * | | fixed .bzr-mysql/default.confBjorn Munch2009-05-291-1/+1
| | | * | | merge 5.0-main -> 5.1-mainGeorgi Kodinov2009-05-281-1/+1
| | | |\ \ \
| | | | * | | changed the versionGeorgi Kodinov2009-05-281-1/+1
* | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-091-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge from mysql-trunk.Alexander Nozdrin2009-10-091-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Update version in default.conf.Alexander Nozdrin2009-10-091-1/+1
| | * | | | | | | Fix default.cof.Alexander Nozdrin2009-10-091-1/+1
| | * | | | | | | Update default.confAlexander Nozdrin2009-10-011-1/+1
* | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-091-1/+1
|/ / / / / / / /
* | | | | | | | Update default.conf.Alexander Nozdrin2009-09-281-1/+1
* | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-09-251-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge from mysql-trunk (update default.conf).Alexander Nozdrin2009-09-251-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Update default.confAlexander Nozdrin2009-09-251-1/+1
| * | | | | | | | Merge from mysql-trunk-alik (stabilizing changes).Alexander Nozdrin2009-09-241-1/+1
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | | _ / / / / / / | | / / / / / /
| * | | | | | | Mark some tests experimental.Alexander Nozdrin2009-09-241-1/+1
* | | | | | | | Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr).Alexander Nozdrin2009-09-231-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | fixed tree nameMarc Alff2009-09-171-1/+1
* | | | | | | | Update default.conf.Alexander Nozdrin2009-09-231-1/+1
* | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-09-231-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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 mysql-trunk-bugfixing -> mysql-next-mr-bugfixing.Alexander Nozdrin2009-09-161-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Fix default.confAlexander Nozdrin2009-09-161-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge mysql-trunk -> mysql-next-mr.Alexander Nozdrin2009-09-161-1/+1
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Fix default.confAlexander Nozdrin2009-09-161-1/+1
|/ / / /
* | | | Fix default.confAlexander Nozdrin2009-08-261-1/+1
| |_|/ |/| |
* | | version changeGeorgi Kodinov2009-06-161-1/+1
|\ \ \ | |/ / |/| |
| * | fixed versionGeorgi Kodinov2009-06-161-1/+1
| |/
* | merged addendum to bug 39920 to 5.1-bugteamGeorgi Kodinov2008-12-011-1/+1
|\ \ | |/
| * Restore team tree name.Davi Arnaut2008-09-201-1/+1
| * Restore tree name after merge from main.Davi Arnaut2008-09-011-1/+1
| * Correcting tree name in bzr config. Should not include team suffix.Chad MILLER2008-08-151-1/+1
| * Merge and fix tree name.Davi Arnaut2008-08-121-1/+1
* | Merge from 5.0. Update version.Chad MILLER2008-05-231-1/+1
|/
* Merge metainfo for mailer plugin.Chad Miller2008-05-221-1/+1
* Add branch metainfo for mailer plugin.Chad MILLER2008-05-211-0/+4