summaryrefslogtreecommitdiff
path: root/sql/handler.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-06-121-0/+34
|\
| * MDEV-19653 Add class Sql_cmd_create_tableAlexander Barkov2019-05-311-0/+34
* | MDEV-19158: MariaDB 10.2.22 is writing duplicate entries into binary logSujatha2019-05-141-2/+2
* | Merge 10.1 into 10.2Marko Mäkelä2019-05-131-2/+2
|\ \ | |/
| * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-2/+2
| |\
| | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-111-1/+1
* | | MDEV-16240: Assertion `0' failed in row_sel_convert_mysql_key_to_innobasebb-10.2-MDEV-16240Oleksandr Byelkin2019-04-251-2/+13
* | | Merge 10.1 into 10.2Marko Mäkelä2019-04-251-0/+1
|\ \ \ | |/ /
| * | Merge 5.5 into 10.1Marko Mäkelä2019-04-241-0/+1
| |\ \ | | |/
| | * MDEV-15772 Potential list overrun during XA recoveryThirunarayanan Balathandayuthapani2019-04-241-0/+1
* | | Merge remote-tracking branch 'origin/10.1' into 10.2Jan Lindström2019-02-281-13/+25
|\ \ \ | |/ /
| * | Revert offending part of MDEV-9519: Data corruption will happen on the Galera...Jan Lindström2019-02-281-13/+25
| * | MDEV-9519: Data corruption will happen on the Galera cluster size changeJulius Goryavsky2019-02-251-14/+36
* | | MDEV-9519: Data corruption will happen on the Galera cluster size changeJulius Goryavsky2019-02-261-14/+36
* | | MDEV-15740 Fix wsrep recovery with wsrep_emulate_bin_logTeemu Ollakka2019-01-271-1/+4
* | | MDEV-15740 Backport wsrep recovery fixes from 10.4.Teemu Ollakka2019-01-251-3/+48
* | | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-1/+3
|\ \ \ | |/ /
| * | Merge branch '10.0-galera' into 10.1Sergei Golubchik2018-09-071-0/+1
| |\ \
| | * | MDEV-16799: Test wsrep.variables crash at sql_class.cc:639 thd_get_ha_dataJan Lindström2018-07-241-0/+1
| * | | compiler warnings (clang 4.0.1 on i386)Sergei Golubchik2018-09-041-1/+2
* | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-311-28/+3
|\ \ \ \ | |/ / /
| * | | Revert MDEV-9519 due to regressionsMarko Mäkelä2018-08-311-28/+3
* | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-211-3/+28
|\ \ \ \ | |/ / /
| * | | This is patch for the https://jira.mariadb.org/browse/MDEV-9519 issue:Julius Goryavsky2018-08-151-3/+28
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-281-2/+2
|\ \ \ \ | |/ / /
| * | | MDEV-16615 ASAN SEGV in handler::print_error or server crash after error upon...Sergei Golubchik2018-06-281-2/+2
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-1/+8
|\ \ \ \ | |/ / /
| * | | MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specif...Sergei Golubchik2018-06-201-3/+0
| * | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-0/+7
| |\ \ \ | | |/ /
| | * | Merge tag 'mariadb-10.0.35' into 10.0-galeraJan Lindström2018-05-071-15/+4
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-0/+6
| | |\ \ \
| | | * \ \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-241-1/+2
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | MW-322 - CTAS fix merged to 5.5-v25 branchsjaakola2017-07-201-0/+5
| | | * | | Merge tag 'mariadb-5.5.56' into 5.5-galeraSachin Setiya2017-05-031-1/+1
| | | |\ \ \
| | | * \ \ \ Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-181-3/+2
| | | |\ \ \ \
| | | * \ \ \ \ Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-271-1/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-101-1/+2
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-251-2/+2
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '5.5' into 5.5-galeraNirbhay Choubey2015-02-181-3/+1
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-091-8/+3
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-061-0/+12
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-101-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-5/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | * Merged revisions 3945, 3946..3950, 3951..3961Nirbhay Choubey2014-02-281-12/+32
| | | * | | | | | | | | | | | | MDEV#5534: mysql_tzinfo_to_sql generates wrong queryNirbhay Choubey2014-02-141-1/+1
| | | * | | | | | | | | | | | | Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-1/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-6/+6
| | | * | | | | | | | | | | | | | MDEV-4108 Compilation warnings with RelWithDebInfoNirbhay Choubey2013-11-251-0/+7
| | | * | | | | | | | | | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-3/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-11-251-13/+2