summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* Fix various spelling errors still found in codeOtto Kekäläinen2021-03-221-1/+1
* Merge mariadb-10.5.9Marko Mäkelä2021-02-171-63/+45
|\
| * Merge branch 'bb-10.4-release' into bb-10.5-releaseSergei Golubchik2021-02-151-63/+45
| |\
| | * MDEV-23328 Server hang due to Galera lock conflict resolutionSergei Golubchik2021-02-121-4/+7
| | * don't take mutexes conditionallySergei Golubchik2021-02-121-1/+1
| | * cleanup: THD::abort_current_cond_wait()Sergei Golubchik2021-02-121-18/+13
| | * Merge branch 'bb-10.3-release' into bb-10.4-releaseSergei Golubchik2021-02-121-44/+29
| | |\
| | | * Merge branch '10.2' into 10.3Sergei Golubchik2021-02-011-31/+20
| | | |\
| | | | * MDEV-23851 BF-BF Conflict issue because of UK GAP lockssjaakola2021-01-181-1/+11
| | | | * MDEV-23536 Race condition between KILL and transaction commitSergei Golubchik2021-01-111-0/+3
| | | | * Revert "MDEV-23536 : Race condition between KILL and transaction commit"Sergei Golubchik2021-01-111-31/+7
* | | | | Ignore reporting in thd_progress_report() if we cannot lock LOCK_thd_dataMonty2021-02-151-1/+7
|/ / / /
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-01-111-25/+48
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-01-111-25/+48
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3 (except MDEV-17556)Marko Mäkelä2021-01-111-12/+36
| | |\ \ | | | |/
| | | * MDEV-23536 : Race condition between KILL and transaction commitJan Lindström2021-01-081-7/+31
| | | * MDEV-23875 is failing to build on windows.Rucha Deodhar2021-01-041-1/+1
| | | * MDEV-23875: select into outfile not respect UMASK and UMASK_DIRRucha Deodhar2020-12-311-3/+3
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-12-021-2/+2
|\ \ \ \ | |/ / /
| * | | MDEV-15532 after-merge fixes from MontyMarko Mäkelä2020-12-021-1/+1
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-12-011-1/+1
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2020-12-011-1/+1
| | |\ \ | | | |/
| | | * MDEV 15532 Assertion `!log->same_pk' failed in row_log_table_apply_deleteMonty2020-11-301-1/+1
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-11-031-1/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-11-031-1/+2
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2020-11-021-1/+2
| | |\ \ | | | |/
| | | * MDEV-22387: Do not violate __attribute__((nonnull))Marko Mäkelä2020-11-021-1/+2
* | | | Merge 10.4 to 10.5Marko Mäkelä2020-10-221-1/+1
|\ \ \ \ | |/ / /
| * | | MDEV-20945: BACKUP UNLOCK + FTWRL assertion failureRinat Ibragimov2020-10-221-1/+1
* | | | Trivial fixups, no code changesMonty2020-10-211-5/+5
* | | | MDEV-23691 S3 storage engine: delayed slave can drop the tableMonty2020-10-211-0/+32
* | | | Merge branch '10.4' into 10.5Sujatha2020-09-291-2/+26
|\ \ \ \ | |/ / /
| * | | Added asssert to init_of_queries() to make it more safeMonty2020-09-251-0/+1
| * | | MDEV-23586 Mariabackup: GTID saved for replication in 10.4.14 is wrongMonty2020-09-251-3/+27
| * | | Backported setting of transcation.on=1 in THD::reset_for_reuse()Monty2020-09-251-0/+1
* | | | MDEV-19275 Provide SQL service to plugins.Alexey Botchkov2020-08-141-0/+55
* | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2020-08-041-3/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-08-031-3/+1
| |\ \ \ | | |/ /
| | * | MDEV-19632 Replication aborts with ER_SLAVE_CONVERSION_FAILED upon CREATE ......Alexander Barkov2020-08-011-3/+1
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-08-011-1/+0
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-07-311-1/+0
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2020-07-311-1/+0
| | |\ \ | | | |/
| | | * fix assertionNikita Malyavin2020-07-221-1/+0
| | | * fix c++98 buildNikita Malyavin2020-07-211-2/+2
| | | * MDEV-16039 Crash when selecting virtual columns generated using functions wit...Nikita Malyavin2020-07-211-2/+2
| * | | MDEV-21953 deadlock between BACKUP STAGE BLOCK_COMMIT and parallel repl.Monty2020-07-211-2/+5
| * | | MDEV-21910 Deadlock between BF abort and manual KILL commandsjaakola2020-06-261-0/+10
* | | | thd->m_transaction_psi was not properly cleared for new connectionsMonty2020-07-231-2/+7
* | | | MDEV-21910 Deadlock between BF abort and manual KILL commandbb-10.5-MDEV-21910sjaakola2020-07-221-0/+10
* | | | MDEV-23154 Add a data type my_repertoire_tAlexander Barkov2020-07-131-1/+2