summaryrefslogtreecommitdiff
path: root/storage/xtradb/srv
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0 into 10.1Marko Mäkelä2017-02-091-1/+1
|\
| * Post-push fix for MDEV-11947 InnoDB purge workers fail to shut downMarko Mäkelä2017-02-091-1/+1
* | Merge 10.0 into 10.1Marko Mäkelä2017-02-082-158/+146
|\ \ | |/
| * Rewrite the innodb.log_file_size test with DBUG_EXECUTE_IF.Marko Mäkelä2017-02-052-48/+58
| * MDEV-11947 InnoDB purge workers fail to shut downMarko Mäkelä2017-02-041-110/+88
* | Merge 10.0 into 10.1Marko Mäkelä2017-01-261-159/+103
|\ \ | |/
| * MDEV-11915 Detect InnoDB system tablespace size mismatch earlyMarko Mäkelä2017-01-261-160/+91
* | MDEV-11623 MariaDB 10.1 fails to start datadir created withMarko Mäkelä2017-01-151-7/+11
* | Post-push fix for MDEV-11556: Make the debug variable UINT.Marko Mäkelä2017-01-071-1/+1
* | MDEV-11638 Encryption causes race conditions in InnoDB shutdownMarko Mäkelä2017-01-052-82/+18
* | Merge 10.0 into 10.1Marko Mäkelä2017-01-041-7/+1
|\ \ | |/
| * MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICTbb-10.0-mdev-11694Marko Mäkelä2017-01-031-6/+1
* | MDEV-11556 InnoDB redo log apply fails to adjust data file sizesMarko Mäkelä2016-12-301-13/+15
* | MDEV-9282 Debian: the Lintian complains about "shlib-calls-exit" in ha_innodb.soMarko Mäkelä2016-12-281-11/+2
* | MDEV-11630 Call mutex_free() before freeing the mutex listMarko Mäkelä2016-12-221-1/+1
* | MDEV-10368: get_latest_version() called too oftenJan Lindström2016-12-131-0/+2
* | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-0/+6
|\ \
| * \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-283-9/+19
| |\ \ | | |/
| | * Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-0/+6
| | |\
| | | * 5.6.33-79.0Sergei Golubchik2016-10-251-0/+6
| * | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-242-17/+17
| |\ \ \
| * | | | Postfix: memory leak in XtraDBmariadb-galera-10.0.26Nirbhay Choubey2016-06-301-3/+4
| * | | | Fix memory leak in XtraDB.Nirbhay Choubey2016-06-271-0/+3
| * | | | Fix build failure.Nirbhay Choubey2016-06-241-1/+1
| * | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-243-65/+87
| |\ \ \ \
| * \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-292-19/+19
| |\ \ \ \ \
| * \ \ \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-233-42/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-192-17/+23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-313-16/+54
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-5/+24
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-092-4/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | MDEV-8057: Galera conflicts with InnoDB buffer pool dumpNirbhay Choubey2015-04-281-1/+16
| * | | | | | | | | | | | Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-12/+23
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-262-25/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-052-4/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-282-14/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-113-7/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | MDEV-6492: MariaDB Galera Cluster cant use rsync sstNirbhay Choubey2014-07-311-0/+25
| * | | | | | | | | | | | | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-213-12/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-21/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | bzr merge -r4021..4026 codership-mysql/5.6.Nirbhay Choubey2014-03-251-21/+0
| * | | | | | | | | | | | | | | | | | | Merging wsrep specific changes from InnoDB toNirbhay Choubey2014-03-261-1/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808).Nirbhay Choubey2014-03-261-1/+61
| | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-262-23/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-22/+21
| * | | | | | | | | | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-256-6886/+9333
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-042-12/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 10.0 to galera-10.0Jan Lindström2013-09-032-23/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \