summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-0/+1
|\
| * MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specif...Sergei Golubchik2018-06-201-6/+0
| * Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-0/+1
| |\
| | * Merge tag 'mariadb-10.0.35' into 10.0-galeraJan Lindström2018-05-071-1/+1
| | |\
| | * \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-0/+1
| | |\ \
| | | * \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-241-0/+4
| | | |\ \
| | | * \ \ Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-191-0/+24
| | | |\ \ \
| | | * | | | MW-416 Replicating DDL after ACL check, 5.6 versionsjaakola2017-10-191-0/+1
| | | * | | | Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-191-1/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-181-19/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52Nirbhay Choubey2016-09-191-1/+7
| | | |\ \ \ \ \ \
| | | * | | | | | | MW-292 Reset timestamp after transaction replayDaniele Sciascia2016-08-101-0/+1
| | | * | | | | | | Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-251-1/+13
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-011-0/+28
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-031-1/+24
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | MDEV-13577 slave_parallel_mode=optimistic should not report the mode'sAndrei Elkin2018-06-121-0/+6
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2Monty2018-05-241-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-201-15/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | MDEV-15347: Valgrind or ASAN errors in mysql_make_view on query from informat...Oleksandr Byelkin2018-05-151-15/+0
* | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #723 from codership/10.1-MDEV-16005Jan Lindström2018-04-271-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | MDEV-16005 sporadic failures with galera tests MW-328B and MW-328Csjaakola2018-04-241-1/+0
* | | | | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2018-04-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2018-04-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | MDEV-15456 Server crashes upon adding or dropping a partition in ALTER under ...Sergei Golubchik2018-04-201-1/+1
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Partially revert commit 2a729b5f4b14f9f04cf81e1d8dd4eec4ad6cb7cdMarko Mäkelä2018-03-211-8/+0
* | | | | | | | | | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2018-03-211-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | refs MW-245 - merged wsrep_dirty_reads and wsrep_reject_queries from PXCsjaakola2018-03-201-0/+8
* | | | | | | | | | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-1/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-0/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-0/+28
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | / | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Fix Item tree changes/rollback debug printOleksandr Byelkin2018-01-231-0/+4
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | MDEV-14609 XA Transction unable to ROLLBACK TO SAVEPOINTAlexander Barkov2018-01-151-0/+24
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | | | | | | | MDEV-14857: problem with 10.2.11 server crashing when executing stored procedureOleksandr Byelkin2018-02-011-1/+15
* | | | | | | | | MDEV-14603 signal 11 with short stacktraceAlexander Barkov2018-01-231-0/+19
* | | | | | | | | Moving a change_list related methods from THD to Item_change_listAlexander Barkov2018-01-161-14/+23
* | | | | | | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-2/+2
* | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-09-221-0/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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.1' into 10.2Vicențiu Ciorbaru2017-09-191-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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 10.1 into 10.2Marko Mäkelä2017-08-311-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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