summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2020-05-251-17/+60
|\
| * Fixed deadlock with LOCK TABLES and ALTER TABLEMonty2020-05-231-17/+60
* | Merge remote-tracking branch 'origin/10.2' into 10.3Alexander Barkov2020-05-161-16/+10
|\ \ | |/
| * Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2020-05-161-14/+8
| |\
| | * MDEV-22579 No error when inserting DEFAULT(non_virtual_column) into a virtual...Alexander Barkov2020-05-151-4/+2
* | | Merge branch '10.2' into 10.3mariadb-10.3.23Sergei Golubchik2020-05-091-0/+9
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2mariadb-10.2.32Oleksandr Byelkin2020-05-081-0/+9
| |\ \ | | |/
| | * MDEV-22180 Planner opens unnecessary tables when updated table is referenced ...Sergei Golubchik2020-05-081-0/+9
* | | Merge 10.2 into 10.3Marko Mäkelä2020-04-271-2/+2
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2020-04-271-2/+2
| |\ \ | | |/
| | * MDEV-22203: WSREP_ON is unnecessarily expensive to evaluateMarko Mäkelä2020-04-271-2/+2
* | | Merge 10.2 into 10.3Marko Mäkelä2019-10-181-0/+1
|\ \ \ | |/ /
| * | MDEV-10748 Server crashes in ha_maria::implicit_commitMonty2019-10-151-3/+11
* | | MDEV-20074: Lost connection on update triggerOleksandr Byelkin2019-10-171-9/+18
* | | Merge 10.2 into 10.3Marko Mäkelä2019-10-091-26/+0
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-10-091-26/+0
| |\ \ | | |/
| | * Cleanup EITSSergey Vojtovich2019-10-021-26/+0
| | * MDEV-20091 DROP TEMPORARY table is logged despite no CREATE was loggedSujatha2019-07-251-39/+45
| | * imporve clang buildEugene Kosov2019-06-251-1/+1
* | | Merge 10.2 into 10.3Marko Mäkelä2019-09-041-12/+9
|\ \ \ | |/ /
| * | MDEV-20403 Assertion `0' or Assertion `btr_validate_index(index, 0)' failed i...Sergei Golubchik2019-09-041-6/+2
| * | MDEV-20403 Assertion `0' or Assertion `btr_validate_index(index, 0)' failed i...Sergei Golubchik2019-09-031-3/+7
| * | cleanup: on update default nowSergei Golubchik2019-09-031-2/+2
| * | Fixed assertion Assertion `!table->pos_in_locked_tables' failedMonty2019-08-081-0/+1
* | | MDEV-18154 Deadlock and assertion upon no-op ALTER under LOCK TABLESAleksey Midenkov2019-08-161-3/+10
* | | MDEV-18154 Deadlock and assertion upon no-op ALTER under LOCK TABLESAleksey Midenkov2019-08-111-0/+1
* | | MDEV-19304 Segfault in ALTER TABLE after UPDATE for SIMULTANEOUS_ASSIGNMENTAleksey Midenkov2019-08-111-5/+4
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-06-141-5/+6
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-06-131-5/+6
| |\ \ | | |/
| | * Merge branch '5.5' into 10.1Oleksandr Byelkin2019-06-121-5/+6
| | |\
| | | * MDEV-19491 update query stopped working after mariadb upgrade 10.2.23 -> 10.2.24Sergei Golubchik2019-06-011-0/+3
| | | * cleanupSergei Golubchik2019-06-011-5/+3
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-05-171-3/+2
|\ \ \ \ | |/ / /
| * | | MDEV-19490 show tables fails when selecting the information_schema databaseMonty2019-05-161-3/+2
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-0/+8
|\ \ \ \ | |/ / /
| * | | MDEV-19158: MariaDB 10.2.22 is writing duplicate entries into binary logSujatha2019-05-141-0/+8
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| | |\ \ | | | |/
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-05-121-45/+57
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-05-061-4/+5
| |\ \ \ | | |/ /
| | * | MDEV-17883: CREATE TABLE IF NOT EXISTS locking changes in 10.3.10Jan Lindström2019-05-031-4/+5
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-05-041-43/+52
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-05-021-2/+1
| | |\ \ | | | |/
| | | * MDEV-19349 mysql_install_db: segfault at tmp_file_prefix checkAleksey Midenkov2019-05-011-7/+1
| | * | Merge branch '5.5' into 10.1Sergei Golubchik2019-04-261-41/+51
| | |\ \ | | | |/
| | | * MDEV-18507 can't update temporary table when joined with table with triggers ...Sergei Golubchik2019-04-241-1/+1
| | | * cleanupSergei Golubchik2019-04-241-43/+52
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-04-071-1/+24
|\ \ \ \ | |/ / /