summaryrefslogtreecommitdiff
path: root/sql/sql_reload.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
|\
| * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| |\
| | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-2/+11
|\ \ \ | |/ /
| * | MDEV-15890 Strange error message if you try to FLUSH TABLES <view> after LOCK...Alexey Botchkov2018-09-021-2/+11
* | | MDEV-12466 : Assertion `thd->transaction.stmt.is_empty() || thd->in_sub_stmt ...Sergei Petrunia2018-04-071-0/+2
* | | Merge branch '10.1' into 10.2Sergei Golubchik2017-11-211-1/+4
|\ \ \ | |/ /
| * | MDEV-12012/MDEV-11969 Can't remove GTIDs for a stale GTID Domain IDAndrei Elkin2017-11-151-1/+4
* | | Merge 10.1 into 10.2Marko Mäkelä2017-06-191-1/+2
|\ \ \ | |/ /
| * | MDEV-12620 - set lock_wait_timeout = 1;flush tables with read lock;Sergey Vojtovich2017-06-161-1/+2
* | | Merge 10.1 into 10.2Marko Mäkelä2017-06-081-2/+6
|\ \ \ | |/ /
| * | MDEV-9544 FLUSH [RELAY] LOGS does not rotate logs for a named slaveSachin Setiya2017-06-051-2/+6
* | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-27/+29
|\ \ \ | |/ /
| * | Merge 10.0 into 10.1Marko Mäkelä2017-03-031-27/+29
| |\ \
| | * | MDEV-9573 'Stop slave' hangs on replication slaveMonty2017-02-281-27/+29
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-0/+6
|\ \ \ \ | |/ / /
| * | | MDEV-9423: cannot add new node to the cluser: Binlog..mariadb-10.1.15Nirbhay Choubey2016-06-291-0/+6
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-1/+2
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-211-1/+2
| | |\ \ | | | |/
| | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-1/+2
| | | |\
| | | | * Bug#23251517: SEMISYNC REPLICATION HANGINGmysql-5.5.50Sujatha Sivakumar2016-05-161-1/+1
| | | | * Bug#20685029: SLAVE IO THREAD SHOULD STOP WHEN DISK ISSujatha Sivakumar2016-03-011-2/+2
* | | | | Reuse THD for new user connectionsMonty2016-06-041-1/+1
|/ / / /
* | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |