Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -24/+44 |
|\ | |||||
| * | MySQL WL#5522 - InnoDB transportable tablespaces. | Sergei Golubchik | 2014-02-02 | 1 | -102/+43 |
| * | Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces. | Sergei Golubchik | 2014-02-02 | 1 | -1/+80 |
* | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -1/+1 |
| |\ | |||||
| | * | MDEV-26: Global transaction ID. | unknown | 2013-08-23 | 1 | -1/+1 |
* | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -2/+2 |
| * | | | MDEV-4547 [PATCH] Make REFRESH_* constants to be 64-bit in 32-bit compilation | unknown | 2013-07-16 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+12 |
|/ / | |||||
* | | MDEV-3917 multiple use locks (GET_LOCK) in one connection. | Alexey Botchkov | 2013-04-12 | 1 | -0/+1 |
|/ | |||||
* | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
* | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-10-04 | 1 | -5/+46 |
|\ | |||||
| * | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC. | Michael Widenius | 2012-10-03 | 1 | -1/+17 |
| * | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-09-28 | 1 | -1/+16 |
|/ | |||||
* | 5.3 merge | Sergei Golubchik | 2012-05-21 | 1 | -2/+3 |
* | More fixes for LOCK TABLE and REPAIR/FLUSH | Michael Widenius | 2012-05-17 | 1 | -3/+3 |
* | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -4/+30 |
|\ | |||||
| * | Merge from mysql-5.5.18-release | unknown | 2011-11-17 | 1 | -3/+29 |
| |\ | |||||
| | * | Manual merge from mysql-5.1-security. | Alexander Nozdrin | 2011-09-23 | 1 | -3/+29 |
| * | | Bug#11763573 - 56299: MUTEX DEADLOCK WITH COM_BINLOG_DUMP, BINLOG PURGE, AND ... | Andrei Elkin | 2011-10-27 | 1 | -1/+1 |
| |/ | |||||
* | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+18 |
* | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -29/+56 |
|\ \ | |/ | |||||
| * | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -1/+1 |
| * | Bug #11764779 (former 57649) | Jon Olav Hauglid | 2011-03-07 | 1 | -3/+17 |
| * | BUG#46166 | Luis Soares | 2010-12-07 | 1 | -6/+15 |
| * | Fix for bug #55273 "FLUSH TABLE tm WITH READ LOCK for Merge | Dmitry Lenev | 2010-09-09 | 1 | -19/+23 |
* | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -0/+29 |
|/ | |||||
* | Extract reload_acl_and_cache() and flush_tables_with_read_lock() | Konstantin Osipov | 2010-08-13 | 1 | -0/+427 |