summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0-galera into 10.1Sergei Golubchik2015-02-061-4/+20
|\
| * maria-10.0.16 mergeNirbhay Choubey2015-01-2636-311/+971
| |\
| * | MDEV-7374 : Losing connection to MySQL while running ALTER TABLENirbhay Choubey2015-01-241-24/+28
| * | MDEV-7129 : Galera duplicate error on autoincrement field primary keyNirbhay Choubey2015-01-071-4/+24
| * | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-0559-569/+1444
| |\ \
| * | | MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc (lock != ctx->wait_...Nirbhay Choubey2014-10-031-3/+0
| * | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-2855-667/+1208
| |\ \ \
| * | | | Fix compiler error when WITH_WSREP is not used.Jan Lindström2014-08-271-9/+8
| * | | | MDEV-6602: rpl.rpl_mdev6020 fails sporadically with SIGABRTJan Lindström2014-08-252-80/+122
| * | | | bzr merge -r4104..4120 codership/5.6/Nirbhay Choubey2014-08-124-57/+144
| * | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-1136-503/+1325
| |\ \ \ \
| * | | | | MDEV-6492: MariaDB Galera Cluster cant use rsync sstNirbhay Choubey2014-07-311-1/+22
| * | | | | Merge -r4105..4106 from codership/5.6Jan Lindström2014-07-042-22/+7
| * | | | | bzr merge -r4091..4101 codership/5.6/Nirbhay Choubey2014-06-195-35/+70
| * | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-2/+6
| |\ \ \ \ \
| * | | | | | bzr merge -r4065..4088 codership/5.6Nirbhay Choubey2014-05-212-4/+11
| * | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-2192-2098/+4354
| |\ \ \ \ \ \
| * | | | | | | Fixes for some test failures.Nirbhay Choubey2014-04-091-1/+6
| * | | | | | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-084-13/+41
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-279-154/+135
| |\ \ \ \ \ \ \ \
| | * | | | | | | | * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-268-125/+96
| | * | | | | | | | bzr merge -r4021..4026 codership-mysql/5.6.Nirbhay Choubey2014-03-252-22/+34
| | * | | | | | | | bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-251-3/+7
| * | | | | | | | | Merging wsrep specific changes from InnoDB toNirbhay Choubey2014-03-262-9/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808).Nirbhay Choubey2014-03-262-9/+5
| | |/ / / / / / / /
| * | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-26155-6407/+10632
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | References: https://mariadb.atlassian.net/browse/MDEV-5908 - Seppo Jaakola2014-03-201-2/+4
| * | | | | | | | | MDEV-5644: Assertion failure during lock_cancel_waiting_and_release.Jan Lindström2014-02-111-50/+153
| * | | | | | | | | MDEV#5626 : Cannot install InnoDB/XtraDB pluginNirbhay Choubey2014-02-104-14/+129
| * | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-303-37/+17
| * | | | | | | | | Fixed issue on wsrep_kill_victim mutexing order error. Furthermore, fixed mergeJan Lindström2014-01-294-13/+18
| * | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-2519-168/+281
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-0429-459/+273
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ported all remaining storage/innobase changes from lp:codership-mysql/5.6, up...Seppo Jaakola2013-11-2710-178/+298
| * | | | | | | | | | | diffed in fix in #3953 from lp:codership-mysql/5.6Seppo Jaakola2013-11-271-20/+22
| * | | | | | | | | | | diffed in the fix from revision #3937 from lp:codership-mysql/5.6Seppo Jaakola2013-11-271-2/+1
| * | | | | | | | | | | bzr merge -c 3921 lp:codership-mysql/5.6Seppo Jaakola2013-11-271-4/+2
| * | | | | | | | | | | bzr merge -r3904..3928 lp:codership-mysql/5.5Seppo Jaakola2013-11-273-11/+26
| * | | | | | | | | | | bzr merge -r3895..3903 lp:codership-mysql/5.5 Seppo Jaakola2013-11-261-24/+19
| * | | | | | | | | | | Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API...Seppo Jaakola2013-11-263-60/+64
| * | | | | | | | | | | Fixed performance schema instrumentation on galera and added correct mutexing...Jan Lindström2013-10-152-5/+10
| * | | | | | | | | | | Added correct mutexing on trx handling.Jan Lindström2013-10-071-12/+22
| * | | | | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5Seppo Jaakola2013-10-071-1/+3
| * | | | | | | | | | | Merged revisions 3411..3417 from mariadb-galera-5.5Seppo Jaakola2013-10-071-1/+31
| * | | | | | | | | | | After merge fixesJan Lindström2013-09-251-89/+90
| * | | | | | | | | | | Fixed merge errors and XA prepareJan Lindström2013-09-041-1/+1
| * | | | | | | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-03252-16644/+49369
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Initial fixes after mariadb 10 merge, basic replication works nowSeppo Jaakola2013-07-163-19/+5
| * | | | | | | | | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-1321-14/+2459