| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix default.conf. | Alexander Nozdrin | 2009-10-27 | 1 | -1/+1 |
| | | |||||
| * | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts ========= Text conflict in .bzr-mysql/default.conf Text conflict in libmysqld/CMakeLists.txt Text conflict in libmysqld/Makefile.am Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/CMakeLists.txt Text conflict in sql/Makefile.am Text conflict in sql/log_event_old.cc Text conflict in sql/rpl_rli.cc Text conflict in sql/slave.cc Text conflict in sql/sql_binlog.cc Text conflict in sql/sql_lex.h 21 conflicts encountered. NOTE ==== mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr: - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr" This is the first cset (merge/...) committed after pulling from mysql-next-mr. | ||||
| | * | Fixed tree_name: mysql-5.1 --> mysql-5.1-rep+2 | Luis Soares | 2009-09-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge from mysql-trunk. | Alexander Nozdrin | 2009-10-23 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix default.conf. | Alexander Nozdrin | 2009-10-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | null merge from trunk-mtr | Bjorn Munch | 2009-09-23 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | new merge from trunk | Bjorn Munch | 2009-09-18 | 1 | -1/+1 |
| | |\ \ | |||||
| | * \ \ | initial merge from 5.1-mtr | Bjorn Munch | 2009-09-04 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | fixed .bzr-mysql/default.conf | Bjorn Munch | 2009-05-29 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | merge 5.0-main -> 5.1-main | Georgi Kodinov | 2009-05-28 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | changed the version | Georgi Kodinov | 2009-05-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Update default.conf. | Alexander Nozdrin | 2009-09-23 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-09-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge from mysql-trunk. | Alexander Nozdrin | 2009-09-23 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Update default.conf. | Alexander Nozdrin | 2009-09-23 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Update default.conf. | Alexander Nozdrin | 2009-09-23 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge mysql-trunk-bugfixing -> mysql-next-mr-bugfixing. | Alexander Nozdrin | 2009-09-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | |||||
| | * | | | | | | Fix default.conf | Alexander Nozdrin | 2009-09-16 | 1 | -1/+1 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge mysql-trunk -> mysql-next-mr. | Alexander Nozdrin | 2009-09-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | |||||
| | * | | | | Fix default.conf | Alexander Nozdrin | 2009-09-16 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Fix default.conf | Alexander Nozdrin | 2009-08-26 | 1 | -1/+1 |
| | |_|/ |/| | | |||||
| * | | | version change | Georgi Kodinov | 2009-06-16 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | fixed version | Georgi Kodinov | 2009-06-16 | 1 | -1/+1 |
| | |/ | |||||
| * | | merged addendum to bug 39920 to 5.1-bugteam | Georgi Kodinov | 2008-12-01 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Restore team tree name. | Davi Arnaut | 2008-09-20 | 1 | -1/+1 |
| | | | |||||
| | * | Restore tree name after merge from main. | Davi Arnaut | 2008-09-01 | 1 | -1/+1 |
| | | | |||||
| | * | Correcting tree name in bzr config. Should not include team suffix. | Chad MILLER | 2008-08-15 | 1 | -1/+1 |
| | | | |||||
| | * | Merge and fix tree name. | Davi Arnaut | 2008-08-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge from 5.0. Update version. | Chad MILLER | 2008-05-23 | 1 | -1/+1 |
| |/ | |||||
| * | Merge metainfo for mailer plugin. | Chad Miller | 2008-05-22 | 1 | -1/+1 |
| | | |||||
| * | Add branch metainfo for mailer plugin. | Chad MILLER | 2008-05-21 | 1 | -0/+4 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |
path: root/.bzr-mysql