Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -1/+1 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+6 |
| | |\ \ | |||||
| | | * \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -0/+1 |
| | | |\ \ | |||||
| | | * | | | MW-416 Replicating DDL after ACL check, 5.6 version | sjaakola | 2017-10-19 | 1 | -0/+5 |
| | | * | | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 1 | -0/+3 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -0/+7 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 1 | -1/+1 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -2/+2 |
| | | * | | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -3/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | references lp:1011983 | Seppo Jaakola | 2012-06-12 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -0/+52 |
| | * | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | MDEV-7996 : CURRENT_USER definer does not replicate for triggers | Nirbhay Choubey | 2015-04-16 | 1 | -2/+6 |
| | * | | | | | | | | | | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -60/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API... | Seppo Jaakola | 2013-11-26 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -12/+43 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+52 |
* | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-05-29 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | MDEV-16093 Memory leak with triggers | Monty | 2018-05-26 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-20 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | MDEV-15347: Valgrind or ASAN errors in mysql_make_view on query from informat... | Oleksandr Byelkin | 2018-05-15 | 1 | -4/+2 |
* | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-04-24 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-04-24 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-04-20 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-04-19 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | BUG#27216817: INNODB: FAILING ASSERTION:mysql-5.5.60 | Nisha Gopalakrishnan | 2018-02-26 | 1 | -2/+2 |
| | | | * | | | | | | | | | | | | | | | | Bug #17503460 MYSQL READ ONLY DOESN'T WORK FOR DROP TRIGGER | Bharathy Satish | 2014-01-07 | 1 | -0/+7 |
| | | | * | | | | | | | | | | | | | | | | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| | | | * | | | | | | | | | | | | | | | | Manual-merge of patch for bug#11753738 from mysql-5.1 tree. | Dmitry Shulga | 2011-06-10 | 1 | -10/+139 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | | | | Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLY | Dmitry Shulga | 2011-06-10 | 1 | -12/+136 |
| | | | * | | | | | | | | | | | | | | | | | A patch for Bug#11763166 (55847: SHOW WARNINGS returns empty | Alexander Nozdrin | 2011-04-15 | 1 | -13/+12 |
| | | | * | | | | | | | | | | | | | | | | | Patch for Bug#11765684 (58674: SP-cache does not detect changes in | Alexander Nozdrin | 2011-03-10 | 1 | -0/+7 |
| | | | * | | | | | | | | | | | | | | | | | Bug #11764779 (former 57649) | Jon Olav Hauglid | 2011-03-07 | 1 | -3/+2 |
| | | | * | | | | | | | | | | | | | | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -14/+0 |
| | | | * | | | | | | | | | | | | | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtime | Jon Olav Hauglid | 2010-09-30 | 1 | -0/+9 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-5.1-bugteam. | Dmitry Shulga | 2010-09-07 | 1 | -0/+9 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / | |||||
| | | | | | * | | | | | | | | | | | | | | | | Fixed bug #55421 - Protocol::end_statement(): Assertion `0' on | Dmitry Shulga | 2010-09-07 | 1 | -0/+9 |
| | | | | | * | | | | | | | | | | | | | | | | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -3/+3 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | Bug #56595 RENAME TABLE causes assert on OS X | Jon Olav Hauglid | 2010-09-16 | 1 | -2/+4 |
| | | | * | | | | | | | | | | | | | | | | | | | Bug#27480 (Extend CREATE TEMPORARY TABLES privilege | Alexander Nozdrin | 2010-08-31 | 1 | -1/+1 |
| | | | |/ / / / / / / / / / / / / / / / / / |