| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-21 | 1 | -1/+1 |
| |\ | |||||
| | * | Remove DICT_UNIVERSAL | Marko Mäkelä | 2017-09-20 | 1 | -1/+1 |
| * | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-18 | 1 | -0/+4 |
| |\ \ | |/ | |||||
| | * | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-09-17 | 1 | -0/+4 |
| | |\ | |||||
| | | * | MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytes written to tem… | Jan Lindström | 2017-09-14 | 1 | -0/+4 |
| * | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-14 | 1 | -15/+0 |
| |\ \ \ | |/ / | |||||
| | * | | MDEV-13318 Crash recovery failure after the server is killed during innodb_en... | Marko Mäkelä | 2017-09-12 | 1 | -15/+0 |
| * | | | MDEV-13690: Remove unnecessary innodb_use_mtflush, innodb_mtflush_threads par... | Jan Lindström | 2017-09-01 | 2 | -25/+1 |
| * | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-01 | 1 | -4/+3 |
| |\ \ \ | |/ / | |||||
| | * | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-08-31 | 1 | -3/+1 |
| | |\ \ | | |/ | |||||
| | | * | MDEV-13684 InnoDB race condition between fil_crypt_thread and btr_scrub_init | Marko Mäkelä | 2017-08-31 | 1 | -3/+1 |
| | * | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-08-31 | 1 | -1/+2 |
| | |\ \ | | |/ | |||||
| | | * | Fix test failures on embedded server. | Jan Lindström | 2017-08-31 | 1 | -2/+3 |
| | | * | Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1 | Jan Lindström | 2017-08-29 | 1 | -1/+0 |
| | | |\ | |||||
| | | | * | Merge remote-tracking branch 'origin/10.0-galera' into 10.1 | Jan Lindström | 2017-08-21 | 1 | -1/+0 |
| | | | |\ | |||||
| | | | | * | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 2 | -238/+109 |
| | | | | |\ | |||||
| | | | | * \ | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 3 | -93/+132 |
| | | | | |\ \ | |||||
| | | | | * \ \ | Merge branch '10.0' into bb-10.0-galera | Sachin Setiya | 2017-03-20 | 2 | -6/+6 |
| | | | | |\ \ \ | |||||
| | | | | * \ \ \ | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 3 | -327/+255 |
| | | | | |\ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -0/+1 |
| | | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -2/+5 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 2 | -13/+13 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 3 | -58/+20 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 2 | -3/+14 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 3 | -14/+59 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -5/+25 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | MDEV-8057: Galera conflicts with InnoDB buffer pool dump | Nirbhay Choubey | 2015-04-28 | 1 | -1/+16 |
| | | | | * | | | | | | | | | | | | Merge tag 'mariadb-10.0.17' into 10.0-galera | Nirbhay Choubey | 2015-02-27 | 2 | -4/+7 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -10/+60 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 2 | -4/+96 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 2 | -14/+40 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 3 | -4/+8 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 3 | -11/+57 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -21/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | | | | | | | | | | bzr merge -r4021..4026 codership-mysql/5.6. | Nirbhay Choubey | 2014-03-25 | 1 | -21/+0 |
| | | | | * | | | | | | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 3 | -78/+193 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. | Nirbhay Choubey | 2014-01-30 | 1 | -22/+1 |
| | | | | * | | | | | | | | | | | | | | | | | | | Ported all remaining storage/innobase changes from lp:codership-mysql/5.6, up... | Seppo Jaakola | 2013-11-27 | 1 | -54/+38 |
| | | | | * | | | | | | | | | | | | | | | | | | | diffed in the fix from revision #3937 from lp:codership-mysql/5.6 | Seppo Jaakola | 2013-11-27 | 1 | -2/+1 |
| | | | | * | | | | | | | | | | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 4 | -1032/+1576 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 2 | -0/+179 |
| | | * | | | | | | | | | | | | | | | | | | | | | | MDEV-13557: Startup failure, unable to decrypt ibdata1 | Jan Lindström | 2017-08-29 | 1 | -5/+0 |
| | | * | | | | | | | | | | | | | | | | | | | | | | MDEV-13591: InnoDB: Database page corruption on disk or a failed file read an... | Jan Lindström | 2017-08-28 | 1 | -6/+23 |
| | | |/ / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bb-10.2-ext' into 10.3 | Sergei Golubchik | 2017-08-26 | 2 | -35/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | MDEV-13485 MTR tests fail massively with --innodb-sync-debug | Marko Mäkelä | 2017-08-23 | 2 | -21/+0 |
| | * | | | | | | | | | | | | | | | | | | | | | | Follow-up fix to MDEV-12988 backup fails if innodb_undo_tablespaces>0 | Marko Mäkelä | 2017-08-18 | 1 | -0/+4 |
| | * | | | | | | | | | | | | | | | | | | | | | | MDEV-12988 backup fails if innodb_undo_tablespaces>0 | Marko Mäkelä | 2017-08-17 | 1 | -13/+22 |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | MDEV-13325: InnoDB assert dict_sys->size > 0 during ALTER TABLEbb-10.0-jan | Jan Lindström | 2017-07-21 | 1 | -1/+1 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |