summaryrefslogtreecommitdiff
path: root/sql/sql_reload.cc
Commit message (Expand)AuthorAgeFilesLines
* * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-24/+44
|\
| * MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-102/+43
| * Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-1/+80
* | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-1/+1
|\ \ | |/
| * 10.0-base merge.Sergei Golubchik2013-09-211-1/+1
| |\
| | * MDEV-26: Global transaction ID.unknown2013-08-231-1/+1
* | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-3/+3
|\ \ \ | |/ /
| * | 10.0-monty mergeSergei Golubchik2013-07-211-2/+2
| |\ \
| | * | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-2/+2
| * | | MDEV-4547 [PATCH] Make REFRESH_* constants to be 64-bit in 32-bit compilationunknown2013-07-161-1/+1
| | |/ | |/|
* | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-1/+12
|/ /
* | MDEV-3917 multiple use locks (GET_LOCK) in one connection.Alexey Botchkov2013-04-121-0/+1
|/
* MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+1
* Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-10-041-5/+46
|\
| * Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-1/+17
| * Implementation of Multi-source replication (MDEV:253)Michael Widenius2012-09-281-1/+16
|/
* 5.3 mergeSergei Golubchik2012-05-211-2/+3
* More fixes for LOCK TABLE and REPAIR/FLUSHMichael Widenius2012-05-171-3/+3
* mysql-5.5 mergeSergei Golubchik2012-01-161-4/+30
|\
| * Merge from mysql-5.5.18-releaseunknown2011-11-171-3/+29
| |\
| | * Manual merge from mysql-5.1-security.Alexander Nozdrin2011-09-231-3/+29
| * | Bug#11763573 - 56299: MUTEX DEADLOCK WITH COM_BINLOG_DUMP, BINLOG PURGE, AND ...Andrei Elkin2011-10-271-1/+1
| |/
* | merge with 5.3Sergei Golubchik2011-10-191-1/+18
* | 5.5-mergeSergei Golubchik2011-07-021-29/+56
|\ \ | |/
| * Merge from 5.1.Guilhem Bichot2011-05-211-1/+1
| * Bug #11764779 (former 57649)Jon Olav Hauglid2011-03-071-3/+17
| * BUG#46166Luis Soares2010-12-071-6/+15
| * Fix for bug #55273 "FLUSH TABLE tm WITH READ LOCK for MergeDmitry Lenev2010-09-091-19/+23
* | merge.Sergei Golubchik2010-11-251-0/+29
|/
* Extract reload_acl_and_cache() and flush_tables_with_read_lock()Konstantin Osipov2010-08-131-0/+427