Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix various spelling errors still found in code | Otto Kekäläinen | 2021-03-22 | 1 | -1/+1 |
* | Merge mariadb-10.5.9 | Marko Mäkelä | 2021-02-17 | 1 | -63/+45 |
|\ | |||||
| * | Merge branch 'bb-10.4-release' into bb-10.5-release | Sergei Golubchik | 2021-02-15 | 1 | -63/+45 |
| |\ | |||||
| | * | MDEV-23328 Server hang due to Galera lock conflict resolution | Sergei Golubchik | 2021-02-12 | 1 | -4/+7 |
| | * | don't take mutexes conditionally | Sergei Golubchik | 2021-02-12 | 1 | -1/+1 |
| | * | cleanup: THD::abort_current_cond_wait() | Sergei Golubchik | 2021-02-12 | 1 | -18/+13 |
| | * | Merge branch 'bb-10.3-release' into bb-10.4-release | Sergei Golubchik | 2021-02-12 | 1 | -44/+29 |
| | |\ | |||||
| | | * | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2021-02-01 | 1 | -31/+20 |
| | | |\ | |||||
| | | | * | MDEV-23851 BF-BF Conflict issue because of UK GAP locks | sjaakola | 2021-01-18 | 1 | -1/+11 |
| | | | * | MDEV-23536 Race condition between KILL and transaction commit | Sergei Golubchik | 2021-01-11 | 1 | -0/+3 |
| | | | * | Revert "MDEV-23536 : Race condition between KILL and transaction commit" | Sergei Golubchik | 2021-01-11 | 1 | -31/+7 |
* | | | | | Ignore reporting in thd_progress_report() if we cannot lock LOCK_thd_data | Monty | 2021-02-15 | 1 | -1/+7 |
|/ / / / | |||||
* | | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2021-01-11 | 1 | -25/+48 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2021-01-11 | 1 | -25/+48 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.2 into 10.3 (except MDEV-17556) | Marko Mäkelä | 2021-01-11 | 1 | -12/+36 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-23536 : Race condition between KILL and transaction commit | Jan Lindström | 2021-01-08 | 1 | -7/+31 |
| | | * | MDEV-23875 is failing to build on windows. | Rucha Deodhar | 2021-01-04 | 1 | -1/+1 |
| | | * | MDEV-23875: select into outfile not respect UMASK and UMASK_DIR | Rucha Deodhar | 2020-12-31 | 1 | -3/+3 |
* | | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2020-12-02 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-15532 after-merge fixes from Monty | Marko Mäkelä | 2020-12-02 | 1 | -1/+1 |
| * | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-12-01 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-12-01 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV 15532 Assertion `!log->same_pk' failed in row_log_table_apply_delete | Monty | 2020-11-30 | 1 | -1/+1 |
* | | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2020-11-03 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-11-03 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-11-02 | 1 | -1/+2 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-22387: Do not violate __attribute__((nonnull)) | Marko Mäkelä | 2020-11-02 | 1 | -1/+2 |
* | | | | Merge 10.4 to 10.5 | Marko Mäkelä | 2020-10-22 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-20945: BACKUP UNLOCK + FTWRL assertion failure | Rinat Ibragimov | 2020-10-22 | 1 | -1/+1 |
* | | | | Trivial fixups, no code changes | Monty | 2020-10-21 | 1 | -5/+5 |
* | | | | MDEV-23691 S3 storage engine: delayed slave can drop the table | Monty | 2020-10-21 | 1 | -0/+32 |
* | | | | Merge branch '10.4' into 10.5 | Sujatha | 2020-09-29 | 1 | -2/+26 |
|\ \ \ \ | |/ / / | |||||
| * | | | Added asssert to init_of_queries() to make it more safe | Monty | 2020-09-25 | 1 | -0/+1 |
| * | | | MDEV-23586 Mariabackup: GTID saved for replication in 10.4.14 is wrong | Monty | 2020-09-25 | 1 | -3/+27 |
| * | | | Backported setting of transcation.on=1 in THD::reset_for_reuse() | Monty | 2020-09-25 | 1 | -0/+1 |
* | | | | MDEV-19275 Provide SQL service to plugins. | Alexey Botchkov | 2020-08-14 | 1 | -0/+55 |
* | | | | Merge branch '10.4' into 10.5 | Oleksandr Byelkin | 2020-08-04 | 1 | -3/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2020-08-03 | 1 | -3/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-19632 Replication aborts with ER_SLAVE_CONVERSION_FAILED upon CREATE ...... | Alexander Barkov | 2020-08-01 | 1 | -3/+1 |
* | | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2020-08-01 | 1 | -1/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-07-31 | 1 | -1/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-07-31 | 1 | -1/+0 |
| | |\ \ | | | |/ | |||||
| | | * | fix assertion | Nikita Malyavin | 2020-07-22 | 1 | -1/+0 |
| | | * | fix c++98 build | Nikita Malyavin | 2020-07-21 | 1 | -2/+2 |
| | | * | MDEV-16039 Crash when selecting virtual columns generated using functions wit... | Nikita Malyavin | 2020-07-21 | 1 | -2/+2 |
| * | | | MDEV-21953 deadlock between BACKUP STAGE BLOCK_COMMIT and parallel repl. | Monty | 2020-07-21 | 1 | -2/+5 |
| * | | | MDEV-21910 Deadlock between BF abort and manual KILL command | sjaakola | 2020-06-26 | 1 | -0/+10 |
* | | | | thd->m_transaction_psi was not properly cleared for new connections | Monty | 2020-07-23 | 1 | -2/+7 |
* | | | | MDEV-21910 Deadlock between BF abort and manual KILL commandbb-10.5-MDEV-21910 | sjaakola | 2020-07-22 | 1 | -0/+10 |
* | | | | MDEV-23154 Add a data type my_repertoire_t | Alexander Barkov | 2020-07-13 | 1 | -1/+2 |