Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0-galera' into 10.1 | Nirbhay Choubey | 2015-12-23 | 1 | -0/+10 |
|\ | |||||
| * | MDEV-9224: postfix - thd can be null in reload_acl_and_cache()mariadb-galera-10.0.23 | Nirbhay Choubey | 2015-12-23 | 1 | -1/+1 |
| * | MDEV-9224 : Database lockup on flush in galera | Nirbhay Choubey | 2015-12-22 | 1 | -0/+10 |
| * | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -3/+3 |
| |\ | |||||
| * \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -0/+1 |
| |\ \ | |||||
| * \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -26/+31 |
| |\ \ \ \ | |||||
| * \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -24/+44 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+12 |
* | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | MDEV-9088 Server crashes on shutdown after the second post of feedback report | Sergei Golubchik | 2015-12-19 | 1 | -2/+0 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-12-09 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Bug #21370329 : FLUSH DES_KEY_FILE MAY NOT WORK | Arun Kuruvila | 2015-09-22 | 1 | -2/+3 |
| | | * | | | | | | | Merge from mysql-5.5.18-release | hery.ramilison@oracle.com | 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 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 |
| | | * | | | | | | | Extract reload_acl_and_cache() and flush_tables_with_read_lock() | Konstantin Osipov | 2010-08-13 | 1 | -0/+427 |
| | | / / / / / / | |||||
* | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Set opt_noacl (running with--skip-grant-tables) to 0 if we | Michael Widenius | 2015-10-21 | 1 | -0/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | MDEV-8469 Add RESET MASTER TO x to allow specification of binlog file nr | Monty | 2015-07-16 | 1 | -1/+1 |
* | | | | | | | | don't let current_thd to point to a destroyed THD | Sergei Golubchik | 2015-02-03 | 1 | -2/+0 |
* | | | | | | | | MDEV-7004 - Merge scalability fixes from 10.0-power | Sergey Vojtovich | 2014-12-05 | 1 | -4/+8 |
* | | | | | | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -26/+31 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-6616 Server crashes in my_hash_first if shutdown is performed when FLUSH... | Sergei Golubchik | 2014-09-06 | 1 | -26/+31 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | SHOW and FLUSH for I_S tables. | Sergei Golubchik | 2014-10-11 | 1 | -29/+12 |
* | | | | | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -2/+0 |
* | | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-27 | 1 | -1/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -1/+12 |
| |/ / / / / | |||||
* | | | | | | Made sql_log_slow a session variable | Monty | 2014-08-09 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | 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 |
| |_|_|/ |/| | | | |||||
* | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | MDEV-26: Global transaction ID. | unknown | 2013-08-23 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | 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 |
| |/ / |/| | | |||||
* | | | 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 |
|/ |