summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-1/+7
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-09-271-1/+7
| |\
| | * missing element in prelocked_mode_name[] arraySergei Golubchik2016-09-121-1/+2
| | * DEV-10595 MariaDB daemon leaks memory with specific queryMonty2016-08-251-0/+5
* | | Parallel replication async deadlock killKristian Nielsen2016-09-081-1/+2
* | | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-251-0/+1
|\ \ \
| * \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-6/+10
| |\ \ \ | | |/ /
| * | | Fixes for failing tests (post-merge).Nirbhay Choubey2016-08-211-1/+0
| * | | Refs MW-252sjaakola2016-08-211-1/+0
| * | | Refs MW-252sjaakola2016-08-211-0/+1
| * | | Refs: MW-248sjaakola2016-08-211-0/+1
| * | | MW-292 Reset timestamp after transaction replayDaniele Sciascia2016-07-251-0/+1
| * | | MW-265 Add support for wsrep_max_ws_rowsDaniele Sciascia2016-07-191-0/+1
| * | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-1/+13
| |\ \ \
* | \ \ \ Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-6/+10
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Added new status variables to make it easier to debug certain problems:Monty2016-08-211-0/+4
| * | | | Cleanups and minor fixesMonty2016-08-211-2/+2
| * | | | With parallel replication we have had a couple of bugs where DDL'sMonty2016-08-121-4/+4
| * | | | revert part of 69f1a32Sergei Golubchik2016-06-221-2/+2
| * | | | Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PL...Vladislav Vaintroub2016-06-211-2/+2
| | |/ / | |/| |
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-1/+13
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-1/+13
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-201-1/+13
| | |\ \
| | | * | BUG#20574550 MAIN.MERGE TEST CASE FAILS IF BINLOG_FORMAT=ROWVenkatesh Duggirala2016-02-261-1/+13
* | | | | Fixed wrong counting of global Memory_usedMonty2016-04-281-0/+16
* | | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2016-03-221-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2016-03-221-1/+1
| |\ \ \ \
| | * | | | MDEV-9401: wsrep_forced_binlog_format with binlog causes crashNirbhay Choubey2016-03-181-2/+1
| | * | | | Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-131-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | refs codership/mysql-wsrep#201Daniele Sciascia2016-02-091-0/+1
| | * | | | MDEV-8617: Multiple galera tests failures with --ps-protocolNirbhay Choubey2015-08-141-0/+2
| | * | | | Merge tag 'mariadb-5.5.45' into 5.5-galeraNirbhay Choubey2015-08-071-4/+12
| | |\ \ \ \
* | | | | | | MDEV-5542: GROUP_CONCAT truncate output to 65.536 chars when using DISTINCT o...Oleksandr Byelkin2016-03-011-3/+1
* | | | | | | Fix to ensure updates in gtid_slave_state table do not get binlogged.Nirbhay Choubey2016-02-241-1/+6
* | | | | | | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-1/+6
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | refs codership/mysql-wsrep#201Daniele Sciascia2016-02-221-1/+1
* | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-1/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-1/+5
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-1/+1
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Bug#19941403: FATAL_SIGNAL(SIG 6) IN BUILD_EQUAL_ITEMS_FOR_COND | IN SQL/SQL_...Chaithra Gopalareddy2015-11-201-0/+16
| | | * | | Bug#20788853 MUTEX ISSUE IN SQL/SQL_SHOW.CC RESULTING IN SIG6. SOURCE LIKELYMarc Alff2015-04-081-0/+1
* | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-01-251-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Cleanup of slave code:Monty2016-01-031-0/+1
* | | | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-0/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-0/+1
| |\ \ \ \ \ | | |/ / / /
| * | | | | MDEV-9162 : MariaDB Galera Cluster memory leak on async slave nodeNirbhay Choubey2015-12-141-0/+1
| * | | | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-3/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-4/+12
| |\ \ \ \ \ \
| * | | | | | | MDEV-8240 : Unknown option 'table_type' when using Connect Engine on MGCNirbhay Choubey2015-07-291-40/+42