Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0-galera into 10.1 | Sergei Golubchik | 2015-02-06 | 1 | -4/+20 |
|\ | |||||
| * | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 36 | -311/+971 |
| |\ | |||||
| * | | MDEV-7374 : Losing connection to MySQL while running ALTER TABLE | Nirbhay Choubey | 2015-01-24 | 1 | -24/+28 |
| * | | MDEV-7129 : Galera duplicate error on autoincrement field primary key | Nirbhay Choubey | 2015-01-07 | 1 | -4/+24 |
| * | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 59 | -569/+1444 |
| |\ \ | |||||
| * | | | MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc (lock != ctx->wait_... | Nirbhay Choubey | 2014-10-03 | 1 | -3/+0 |
| * | | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 55 | -667/+1208 |
| |\ \ \ | |||||
| * | | | | Fix compiler error when WITH_WSREP is not used. | Jan Lindström | 2014-08-27 | 1 | -9/+8 |
| * | | | | MDEV-6602: rpl.rpl_mdev6020 fails sporadically with SIGABRT | Jan Lindström | 2014-08-25 | 2 | -80/+122 |
| * | | | | bzr merge -r4104..4120 codership/5.6/ | Nirbhay Choubey | 2014-08-12 | 4 | -57/+144 |
| * | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 36 | -503/+1325 |
| |\ \ \ \ | |||||
| * | | | | | MDEV-6492: MariaDB Galera Cluster cant use rsync sst | Nirbhay Choubey | 2014-07-31 | 1 | -1/+22 |
| * | | | | | Merge -r4105..4106 from codership/5.6 | Jan Lindström | 2014-07-04 | 2 | -22/+7 |
| * | | | | | bzr merge -r4091..4101 codership/5.6/ | Nirbhay Choubey | 2014-06-19 | 5 | -35/+70 |
| * | | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0 | Nirbhay Choubey | 2014-06-19 | 1 | -2/+6 |
| |\ \ \ \ \ | |||||
| * | | | | | | bzr merge -r4065..4088 codership/5.6 | Nirbhay Choubey | 2014-05-21 | 2 | -4/+11 |
| * | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 92 | -2098/+4354 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fixes for some test failures. | Nirbhay Choubey | 2014-04-09 | 1 | -1/+6 |
| * | | | | | | | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 4 | -13/+41 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 9 | -154/+135 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 8 | -125/+96 |
| | * | | | | | | | | bzr merge -r4021..4026 codership-mysql/5.6. | Nirbhay Choubey | 2014-03-25 | 2 | -22/+34 |
| | * | | | | | | | | bzr merge -r3946..3968 codership/5.5 | Nirbhay Choubey | 2014-03-25 | 1 | -3/+7 |
| * | | | | | | | | | Merging wsrep specific changes from InnoDB to | Nirbhay Choubey | 2014-03-26 | 2 | -9/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808). | Nirbhay Choubey | 2014-03-26 | 2 | -9/+5 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 155 | -6407/+10632 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | References: https://mariadb.atlassian.net/browse/MDEV-5908 - | Seppo Jaakola | 2014-03-20 | 1 | -2/+4 |
| * | | | | | | | | | MDEV-5644: Assertion failure during lock_cancel_waiting_and_release. | Jan Lindström | 2014-02-11 | 1 | -50/+153 |
| * | | | | | | | | | MDEV#5626 : Cannot install InnoDB/XtraDB plugin | Nirbhay Choubey | 2014-02-10 | 4 | -14/+129 |
| * | | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. | Nirbhay Choubey | 2014-01-30 | 3 | -37/+17 |
| * | | | | | | | | | Fixed issue on wsrep_kill_victim mutexing order error. Furthermore, fixed merge | Jan Lindström | 2014-01-29 | 4 | -13/+18 |
| * | | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 19 | -168/+281 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 29 | -459/+273 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Ported all remaining storage/innobase changes from lp:codership-mysql/5.6, up... | Seppo Jaakola | 2013-11-27 | 10 | -178/+298 |
| * | | | | | | | | | | | diffed in fix in #3953 from lp:codership-mysql/5.6 | Seppo Jaakola | 2013-11-27 | 1 | -20/+22 |
| * | | | | | | | | | | | diffed in the fix from revision #3937 from lp:codership-mysql/5.6 | Seppo Jaakola | 2013-11-27 | 1 | -2/+1 |
| * | | | | | | | | | | | bzr merge -c 3921 lp:codership-mysql/5.6 | Seppo Jaakola | 2013-11-27 | 1 | -4/+2 |
| * | | | | | | | | | | | bzr merge -r3904..3928 lp:codership-mysql/5.5 | Seppo Jaakola | 2013-11-27 | 3 | -11/+26 |
| * | | | | | | | | | | | bzr merge -r3895..3903 lp:codership-mysql/5.5 | Seppo Jaakola | 2013-11-26 | 1 | -24/+19 |
| * | | | | | | | | | | | Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API... | Seppo Jaakola | 2013-11-26 | 3 | -60/+64 |
| * | | | | | | | | | | | Fixed performance schema instrumentation on galera and added correct mutexing... | Jan Lindström | 2013-10-15 | 2 | -5/+10 |
| * | | | | | | | | | | | Added correct mutexing on trx handling. | Jan Lindström | 2013-10-07 | 1 | -12/+22 |
| * | | | | | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 1 | -1/+3 |
| * | | | | | | | | | | | Merged revisions 3411..3417 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 1 | -1/+31 |
| * | | | | | | | | | | | After merge fixes | Jan Lindström | 2013-09-25 | 1 | -89/+90 |
| * | | | | | | | | | | | Fixed merge errors and XA prepare | Jan Lindström | 2013-09-04 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 252 | -16644/+49369 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Initial fixes after mariadb 10 merge, basic replication works now | Seppo Jaakola | 2013-07-16 | 3 | -19/+5 |
| * | | | | | | | | | | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -6/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 21 | -14/+2459 |