summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2017-09-211-0/+23
|\
| * MDEV-13861 Assertion `0' failed in Protocol::end_statementSergei Golubchik2017-09-211-1/+2
| * MDEV-13290: Assertion Assertion `!is_set() || (m_status == DA_OK_BULK && is_b...Sergei Golubchik2017-09-201-0/+22
* | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-191-1/+1
|\ \ | |/
| * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-09-191-1/+1
| |\
| | * MDEV-13458: Wrong result for aggregate function with distinct clause when the...Varun Gupta2017-08-091-1/+1
* | | Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-0/+2
|\ \ \
| * | | Refs: MW-360 * splitting DROP TABLE query in separate DROP commands for tempo...sjaakola2017-08-111-0/+2
| * | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-19/+0
| |\ \ \ | | |/ /
| * | | Galera MTR Tests: fix variable output in galera_as_slave_gtid_replicate_do_db...Sachin Setiya2017-03-141-0/+1
| * | | Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-1/+7
| |\ \ \
* | | | | MDEV-13179 main.errors fails with wrong errnoMonty2017-08-071-13/+72
* | | | | MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic paralle...Kristian Nielsen2017-07-031-0/+10
* | | | | compiler warning on Win64Sergei Golubchik2017-05-241-1/+1
* | | | | Merge branch '10.0' into 10.1mariadb-10.1.21Sergei Golubchik2017-01-171-20/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-01-171-19/+0
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | bugfix: cmp_item_row::alloc_comparators() allocated on the wrong arenaSergei Golubchik2017-01-151-19/+0
* | | | max_session_mem_used server variableSergei Golubchik2017-01-151-0/+1
* | | | 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
| | |\ \ \ \