summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* After-merge fixup f84e28c119b495da77e197f7cd18af4048fc3126st-10.4-thiruThirunarayanan Balathandayuthapani2021-08-193-8/+22
* Merge 10.3 into 10.4Marko Mäkelä2021-08-1873-447/+1270
|\
| * Merge 10.2 into 10.3Marko Mäkelä2021-08-183-7/+10
| |\
| | * MDEV-26131 fixupMarko Mäkelä2021-08-181-5/+6
| | * MDEV-20931 fixup: innodb.import_corrupted test case cleanupMarko Mäkelä2021-08-181-0/+1
| | * MDEV-26350: select_lex->ref_pointer_array.size() % 5 == 0Daniel Black2021-08-181-2/+3
| * | MDEV-21555 Assertion secondary index is out of sync on delete from versioned ...Aleksey Midenkov2021-08-183-17/+48
| * | MDEV-18734 ASAN additional fix for 10.3Aleksey Midenkov2021-08-181-0/+5
| * | Merge 10.2 into 10.3Marko Mäkelä2021-08-1839-301/+909
| |\ \ | | |/
| | * MDEV-26131 fixup: ./mtr --embedded encryption.innodb_importMarko Mäkelä2021-08-181-0/+1
| | * MDEV-20931 ALTER...IMPORT can crash the serverEugene Kosov2021-08-179-33/+166
| | * MDEV-26131 SEGV in ha_innobase::discard_or_import_tablespaceThirunarayanan Balathandayuthapani2021-08-166-112/+246
| | * MDEV-26376 pars_info_bind_id() unnecessarily copies stringsMarko Mäkelä2021-08-168-51/+37
| | * MDEV-26101: Galera WSREP SST broken on 10.6 under FreeBSDJulius Goryavsky2021-08-162-2/+16
| | * MDEV-26340: rsync uses `--whole-file` only in wan modeJulius Goryavsky2021-08-151-1/+1
| | * MDEV-26211: Cluster joiner node is failed to start when using TLSJulius Goryavsky2021-08-152-30/+66
| | * mysql_client_test: test_bug40365 gcc-11.2.1 indentation complaintDaniel Black2021-08-151-3/+3
| | * Fix cmake warning caused by 751ebe44fda4deb715fc2235548517c287f2a559Vladislav Vaintroub2021-08-091-6/+11
| | * MDEV-18734 ASAN heap-use-after-free upon sorting by blob column from partitio...Aleksey Midenkov2021-08-059-59/+381
| | * bump the VERSIONDaniel Bartholomew2021-08-051-1/+1
| | * cleanup: specifying plugin dependencies in CMakeLists.txtSergei Golubchik2021-08-034-14/+10
| * | MDEV-26206 gap lock is not set if implicit lock existsVlad Lesin2021-08-174-3/+43
| * | bump the VERSIONDaniel Bartholomew2021-08-051-1/+1
| * | MDEV-24523 Execution of JSON_REPLACE failed on SpiderYongxin Xu2021-08-056-1/+168
* | | MDEV-25717 Assertion `owning_thread_id_ == wsrep::this_thread::get_id()'Daniele Sciascia2021-08-185-3/+193
* | | MDEV-26308 : Galera test failure on galera.galera_split_brainLeandro Pacheco2021-08-1811-43/+63
* | | MDEV-26372 enforce-storage-engine=InnoDB has no usability as an option to mys...Marko Mäkelä2021-08-161-43/+3
* | | MDEV-20215: binlog.show_concurrent_rotate failed in buildbot with wrong resultBrandon Nesterenko2021-08-135-3/+28
* | | MENT-1019.bb-10.4-hfAlexey Botchkov2021-08-113-4/+9
* | | mariabackup - fix string format in error messageVladislav Vaintroub2021-08-111-1/+1
* | | Fix test failure on galera_as_slave_replay by adding wait_conditionsJan Lindström2021-08-062-7/+23
* | | bump the VERSIONDaniel Bartholomew2021-08-051-1/+1
* | | Merge branch '10.3' into 10.4mariadb-10.4.21Oleksandr Byelkin2021-08-029-50/+119
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3mariadb-10.3.31Oleksandr Byelkin2021-08-029-50/+119
| |\ \ | | |/
| | * MDEV-26220 Server crashes with indexed by prefix virtual columnmariadb-10.2.40Nikita Malyavin2021-08-024-0/+49
| | * Revert "MDEV-26220 Server crashes with indexed by prefix virtual column"Oleksandr Byelkin2021-08-024-99/+48
| | * MDEV-23752 SHOW EXPLAIN FOR thd waits for sleepSergei Golubchik2021-07-312-19/+25
| | * MDEV-20154 Assertion `len <= col->len | ...` failed in row_merge_buf_addNikita Malyavin2021-07-293-36/+63
| | * Cleanup: Remove redundant conditionsMarko Mäkelä2021-07-291-11/+2
| | * MDEV-26220 Server crashes with indexed by prefix virtual columnNikita Malyavin2021-07-284-48/+99
* | | MDEV-13564 fixup: Remove unused function fts_check_corrupt()Marko Mäkelä2021-08-022-66/+1
* | | Merge branch '10.3' into 10.4Oleksandr Byelkin2021-07-31339-2361/+7428
|\ \ \ | |/ /
| * | fix MDEV-16026 MDEV-16481 embedded server results and restsOleksandr Byelkin2021-07-295-40/+62
| * | Merge branch '10.2' into 10.3Oleksandr Byelkin2021-07-29140-1347/+2664
| |\ \ | | |/
| | * Cleanup: Remove dead codeMarko Mäkelä2021-07-281-6/+0
| | * latest C/CSergei Golubchik2021-07-271-0/+0
| | * MDEV-7209 mroonga storage engine fails to build on OpenBSDSergei Golubchik2021-07-274-2/+2
| | * Merge remote-tracking branch 'merge/merge-pcre' into 10.2Sergei Golubchik2021-07-2728-114/+151
| | |\
| | | * 8.45Sergei Golubchik2021-07-2744-5300/+6704
| | * | Merge remote-tracking branch 'connect/10.2' into 10.2Sergei Golubchik2021-07-27110-1230/+2512
| | |\ \