summaryrefslogtreecommitdiff
path: root/sql/sql_reload.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* 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