Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -2/+1 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-04-20 | 1 | -2/+1 |
| |\ | |||||
| * | | MDEV-15456 Server crashes upon adding or dropping a partition in ALTER under ... | Sergei Golubchik | 2018-04-20 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -1/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-04-19 | 1 | -1/+2 |
| | |\ \ | |||||
| | | * | | BUG#27216817: INNODB: FAILING ASSERTION:mysql-5.5.60 | Nisha Gopalakrishnan | 2018-02-26 | 1 | -2/+2 |
| * | | | | Merge tag 'mariadb-5.5.43' into 5.5-galera | Nirbhay Choubey | 2015-05-04 | 1 | -1/+7 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | bzr merge -rtag:mariadb-5.5.38 maria/5.5 | Nirbhay Choubey | 2014-06-10 | 1 | -13/+38 |
| |\ \ \ \ | |||||
| * | | | | | * Merged revisions 3945, 3946..3950, 3951..3961 | Nirbhay Choubey | 2014-02-28 | 1 | -6/+6 |
| * | | | | | References: MDEV-4572 - merge with mariaDB 5.5.30 | Seppo Jaakola | 2013-05-24 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -18/+23 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | references lp:1011983 | Seppo Jaakola | 2012-06-12 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Merged changes from lp:codership-mysql up to rev 3743 | Seppo Jaakola | 2012-04-26 | 1 | -1/+1 |
| * | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -1/+9 |
* | | | | | | | | | | Refs: MW-360 * reverted WSREP_TO_ISOLATION macros back to original form | sjaakola | 2017-08-11 | 1 | -3/+3 |
* | | | | | | | | | | Refs: MW-360 * splitting DROP TABLE query in separate DROP commands for tempo... | sjaakola | 2017-08-11 | 1 | -1/+1 |
* | | | | | | | | | | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-04-27 | 1 | -1/+7 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Bug#19786309 - CRASH IN UNLOCK TABLES AFTER LOCKING AND TRUNCATING TEMPORARY... | Praveenkumar.Hulakund | 2015-01-14 | 1 | -1/+7 |
| | | * | | | | | | Bug#17942050:KILL OF TRUNCATE TABLE WILL LEAD TO BINARY LOG | Sujatha Sivakumar | 2014-04-15 | 1 | -13/+38 |
| | | * | | | | | | upmerge to bug#14548159 | Rohit Kalhans | 2012-09-22 | 1 | -15/+19 |
| | | * | | | | | | Bug #11764779 (former 57649) | Jon Olav Hauglid | 2011-03-07 | 1 | -2/+2 |
| | | * | | | | | | Bug #57659 Segfault in Query_cache::invalidate_data for TRUNCATE TABLE | Jon Olav Hauglid | 2010-10-29 | 1 | -0/+7 |
| | | * | | | | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.c | Davi Arnaut | 2010-10-06 | 1 | -241/+238 |
| | | * | | | | | | Bug#27480 (Extend CREATE TEMPORARY TABLES privilege | Alexander Nozdrin | 2010-08-31 | 1 | -2/+2 |
| | | * | | | | | | Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime. | Jon Olav Hauglid | 2010-08-18 | 1 | -4/+46 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Bug#49907: ALTER TABLE ... TRUNCATE PARTITION does not wait for | Mattias Jonsson | 2010-08-16 | 1 | -4/+46 |
| | | * | | | | | | | A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". | Konstantin Osipov | 2010-08-09 | 1 | -3/+1 |
| | | |/ / / / / / | |||||
| | | * | | | | | | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-07-13 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -1/+1 |
| | | * | | | | | | | A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATE | Jon Olav Hauglid | 2010-07-01 | 1 | -24/+18 |
| | | |/ / / / / / | |||||
| | | * | | | | | | Bug#42643: InnoDB does not support replication of TRUNCATE TABLE | Davi Arnaut | 2010-05-27 | 1 | -2/+2 |
| | | * | | | | | | Bug#42643: InnoDB does not support replication of TRUNCATE TABLE | Davi Arnaut | 2010-05-27 | 1 | -0/+21 |
| | | * | | | | | | Bug#42643: InnoDB does not support replication of TRUNCATE TABLE | Davi Arnaut | 2010-05-25 | 1 | -0/+464 |
| | | / / / / / | |||||
* | | | | | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0 | Nirbhay Choubey | 2014-06-19 | 1 | -13/+39 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -13/+39 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | mysql-5.5.38 merge | Sergei Golubchik | 2014-06-03 | 1 | -13/+38 |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | Bug#17942050:KILL OF TRUNCATE TABLE WILL LEAD TO BINARY LOG | Sujatha Sivakumar | 2014-04-15 | 1 | -13/+38 |
* | | | | | | | | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | MDEV-5979 Server crashes on truncating a temporary InnoDB table on Windows | Sergei Golubchik | 2014-03-28 | 1 | -1/+1 |
| * | | | | | | | Fix for MDEV-5589: "Discrepancy in binlog on half-failed CREATE OR REPLACE" | Michael Widenius | 2014-03-20 | 1 | -2/+5 |
* | | | | | | | | bzr merge -r3946..3968 codership/5.5 | Nirbhay Choubey | 2014-03-25 | 1 | -6/+6 |
* | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -30/+27 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | MDEV-4786 merge 10.0-monty -> 10.0 | Sergei Golubchik | 2013-08-12 | 1 | -2/+1 |
| * | | | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -28/+26 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | merge of 2876.430.11 & 2876.430.1 | unknown | 2013-06-27 | 1 | -15/+13 |
| | * | | | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -13/+13 |
| | | |_|_|_|_|/ | | |/| | | | | |