| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | MDEV-24586: remove mysql_to_mariadb.sqlbb-10.2-MDEV-24586-danielblack-remove-mysql_to_mariadb.sql | Daniel Black | 2021-03-30 | 1 | -1/+0 |
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2020-07-14 | 1 | -29/+30 |
| |\ | |||||
| | * | MDEV-23027 symlink_wsrep_sst_rsync target built when WITH_WSREP is off | Vicențiu Ciorbaru | 2020-07-13 | 1 | -29/+30 |
| * | | Updated mtr files to support different compiled in options | Monty | 2019-09-01 | 1 | -0/+1 |
| * | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-02 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch '10.0' into bb-10.1-merge-sanja | Oleksandr Byelkin | 2018-07-25 | 1 | -0/+2 |
| | |\ \ | |||||
| | | * | | MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helper | Sergei Golubchik | 2018-07-19 | 1 | -0/+2 |
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -1/+16 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -1/+16 |
| | |\ \ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+16 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 1 | -0/+5 |
| | | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | | Merge tag 'mariadb-5.5.57' into 5.5-galera | Jan Lindström | 2017-07-20 | 1 | -2/+9 |
| | | | |\ \ \ | |||||
| | | | * | | | | MDEV-11036 Add link wsrep_sst_rsync_wan -> wsrep_sst_rsyncbb-sachin-11036 | Sachin Setiya | 2017-06-20 | 1 | -0/+16 |
| | | | * | | | | Merge revisions from maria/5.5 (5.5.41) | Nirbhay Choubey | 2014-12-22 | 1 | -7/+0 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 1 | -0/+1 |
| | | | |\ \ \ \ \ | |||||
| | | | * | | | | | | Merge lp:codership-mysql/5.5 -r3961..3980. | Jan Lindström | 2014-04-16 | 1 | -1/+7 |
| | | | * | | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -5/+17 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge of maria/5.5 into maria-5.5-galera. | Nirbhay Choubey | 2014-01-29 | 1 | -1/+8 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -3/+5 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunk | Seppo Jaakola | 2012-09-17 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | references lp:1011983 | Seppo Jaakola | 2012-06-12 | 1 | -1/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -0/+4 |
| | | * | | | | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -0/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 1 | -2/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -16/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -7/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -1/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -5/+15 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -1/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | bzr merge -r3946..3968 codership/5.5 | Nirbhay Choubey | 2014-03-25 | 1 | -1/+7 |
| | | * | | | | | | | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -2/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+4 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | MDEV-14578: mysql_install_db install unix_socket plugin when --auth-root-auth... | Sergei Golubchik | 2018-06-21 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -0/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | | MDEV-13440 mysql_install_db fails with hard-coded langdir | Sergei Golubchik | 2017-10-17 | 1 | -4/+4 |
| | | | * | | | | | | | | | | | | | | | | | | cleanup mysql_install_db | Sergei Golubchik | 2017-10-17 | 1 | -0/+5 |
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -3/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -2/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-07-25 | 1 | -2/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | / / / / / / / / / | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2017-07-18 | 1 | -2/+9 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | BUG#25719975 SHEBANG HARD CODED AS /USR/BIN/PERL IN SCRIPTS, BREAKS ON FREEBSD | Terje Rosten | 2017-03-28 | 1 | -1/+8 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |