summaryrefslogtreecommitdiff
path: root/sql/sql_reload.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-12-231-0/+10
|\
| * MDEV-9224: postfix - thd can be null in reload_acl_and_cache()mariadb-galera-10.0.23Nirbhay Choubey2015-12-231-1/+1
| * MDEV-9224 : Database lockup on flush in galeraNirbhay Choubey2015-12-221-0/+10
| * Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-3/+3
| |\
| * \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-0/+1
| |\ \
| * \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-0/+1
| |\ \ \
| * \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-26/+31
| |\ \ \ \
| * \ \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-24/+44
| |\ \ \ \ \
| * \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge 10.0 to galera-10.0Jan Lindström2013-09-031-3/+3
| |\ \ \ \ \ \ \
| * | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-1/+12
* | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MDEV-9088 Server crashes on shutdown after the second post of feedback reportSergei Golubchik2015-12-191-2/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-3/+3
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2015-12-091-2/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug #21370329 : FLUSH DES_KEY_FILE MAY NOT WORKArun Kuruvila2015-09-221-2/+3
| | | * | | | | | | Merge from mysql-5.5.18-releasehery.ramilison@oracle.com2011-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 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
| | | * | | | | | | Extract reload_acl_and_cache() and flush_tables_with_read_lock()Konstantin Osipov2010-08-131-0/+427
| | | / / / / / /
* | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-11-191-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Set opt_noacl (running with--skip-grant-tables) to 0 if weMichael Widenius2015-10-211-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | MDEV-8469 Add RESET MASTER TO x to allow specification of binlog file nrMonty2015-07-161-1/+1
* | | | | | | | don't let current_thd to point to a destroyed THDSergei Golubchik2015-02-031-2/+0
* | | | | | | | MDEV-7004 - Merge scalability fixes from 10.0-powerSergey Vojtovich2014-12-051-4/+8
* | | | | | | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-26/+31
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-6616 Server crashes in my_hash_first if shutdown is performed when FLUSH...Sergei Golubchik2014-09-061-26/+31
| | |_|_|_|/ | |/| | | |
* | | | | | SHOW and FLUSH for I_S tables.Sergei Golubchik2014-10-111-29/+12
* | | | | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-2/+0
* | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-271-1/+12
|\ \ \ \ \ \
| * | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-1/+12
| |/ / / / /
* | | | | | Made sql_log_slow a session variableMonty2014-08-091-1/+1
|/ / / / /
* | | | | 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
| |_|_|/ |/| | |
* | | | 10.0-base merge.Sergei Golubchik2013-09-211-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | MDEV-26: Global transaction ID.unknown2013-08-231-1/+1
| | |/ | |/|
* | | 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
| |/ / |/| |
* | | 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
|/