Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -0/+67 |
|\ | |||||
| * | MDEV-10630 rpl.rpl_mdev6020 fails in buildbot with timeout | Monty | 2016-08-22 | 1 | -4/+16 |
| * | With parallel replication we have had a couple of bugs where DDL's | Monty | 2016-08-12 | 1 | -0/+53 |
| * | MDEV-9728 - Hard crash in metadata_lock_info | Sergey Vojtovich | 2016-06-21 | 1 | -2/+2 |
* | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-02-24 | 1 | -1/+10 |
|\ \ | |||||
| * | | refs codership/mysql-wsrep#233 | sjaakola | 2016-02-23 | 1 | -1/+1 |
| * | | refs codership/mysql-wsrep#233 | sjaakola | 2016-02-23 | 1 | -0/+10 |
* | | | Merge branch '10.1' into bb-10.1-serg | Sergei Golubchik | 2015-11-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixed compile warnings on Solaris | Monty | 2015-11-20 | 1 | -1/+1 |
* | | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -3/+17 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | refs codership/mysql-wsrep#202 Added schema info into wsrep messages | Philip Stoev | 2015-10-19 | 1 | -3/+5 |
| * | | Refs codership/mysql-wsrep#113 | sjaakola | 2015-09-09 | 1 | -5/+2 |
| * | | Refs codership/mysql-wsrep#113 - Extended the protection of local FLUSH | sjaakola | 2015-09-09 | 1 | -0/+17 |
| * | | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-06-23 | 1 | -1/+11 |
| |\ \ | |||||
| | * | | MDEV-8260 : Issues related to concurrent CTAS | Nirbhay Choubey | 2015-06-19 | 1 | -1/+11 |
| | * | | * Merged the missing revision 3934 from | Nirbhay Choubey | 2014-02-05 | 1 | -4/+4 |
| | * | | Fixes for some compiler warnings. | Nirbhay Choubey | 2014-01-09 | 1 | -1/+1 |
| | * | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -2/+3 |
| | * | | References: lp:1233353 - releasing explicit MDL locks for BF aborted transact... | Seppo Jaakola | 2013-09-30 | 1 | -1/+6 |
| | * | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -4/+8 |
| | |\ \ | |||||
| | * | | | References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysql | Seppo Jaakola | 2012-11-28 | 1 | -0/+30 |
| | * | | | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 1 | -8/+112 |
| | |\ \ \ | |||||
| | * | | | | References lp:1066784 | Seppo Jaakola | 2012-10-23 | 1 | -0/+8 |
| | * | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -2/+96 |
| * | | | | | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -0/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -3/+34 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -7/+0 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 1 | -5/+6 |
| | * | | | | | | | bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only). | Nirbhay Choubey | 2014-03-25 | 1 | -4/+4 |
| * | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -22/+20 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -0/+42 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -10/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | bzr merge -r3890..3891 lp:codership-mysql/5.5 | Seppo Jaakola | 2013-11-06 | 1 | -0/+1 |
| * | | | | | | | | | | Merged revisions 3425..3430 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 1 | -1/+6 |
| * | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -171/+312 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+134 |
* | | | | | | | | | | | | Merge branch '10.0-galera' into 10.1 | Nirbhay Choubey | 2015-07-14 | 1 | -1/+11 |
* | | | | | | | | | | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -0/+1 |
* | | | | | | | | | | | | MDEV-7952 - clock_gettime() takes 0.24% in OLTP RO | Sergey Vojtovich | 2015-06-19 | 1 | -5/+2 |
* | | | | | | | | | | | | MDEV-8073 - Build error in sql/mdl.cc on OS X 10.10 | Sergey Vojtovich | 2015-04-30 | 1 | -6/+6 |
* | | | | | | | | | | | | MDEV-6089 - MySQL WL#7305 "Improve MDL scalability by using lock-free hash" | Sergey Vojtovich | 2015-03-04 | 1 | -164/+128 |
* | | | | | | | | | | | | MDEV-6089 - MySQL WL#7305 "Improve MDL scalability by using lock-free hash" | Sergey Vojtovich | 2015-03-04 | 1 | -196/+150 |
* | | | | | | | | | | | | MDEV-6089 - MySQL WL#7305 "Improve MDL scalability by using lock-free hash" | Sergey Vojtovich | 2015-03-04 | 1 | -129/+26 |
* | | | | | | | | | | | | MDEV-6089 - MySQL WL#7305 "Improve MDL scalability by using lock-free hash" | Sergey Vojtovich | 2015-03-04 | 1 | -189/+77 |
* | | | | | | | | | | | | MDEV-6089 - MySQL WL#7305 "Improve MDL scalability by using lock-free hash" | Sergey Vojtovich | 2015-03-04 | 1 | -149/+27 |
* | | | | | | | | | | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | MDEV-7299 Assertion `m_status == DA_ERROR || m_status == DA_OK' fails on conc... | Sergei Golubchik | 2015-01-19 | 1 | -0/+1 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | cleanup: s/const CHARSET_INFO/CHARSET_INFO/ | Sergei Golubchik | 2014-12-04 | 1 | -1/+1 |