summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.4' into 10.5mariadb-10.5.20bb-10.5-releaseOleksandr Byelkin2023-05-053-1/+40
|\
| * MDEV-31194: Server crash or assertion failure with join_cache_level=4mariadb-10.4.29Sergei Petrunia2023-05-053-1/+40
* | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-047-4/+118
|\ \ | |/
| * MDEV-31189 Server crash or assertion failure in upon 2nd execution of PS with...Oleksandr Byelkin2023-05-043-4/+45
| * MDEV-31057 rocksdb does not compile with gcc-13Sergei Golubchik2023-05-041-0/+5
| * MDEV-31164 default current_timestamp() not working when used INSERT ON DUPLIC...Sergei Golubchik2023-05-043-0/+68
* | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-0410-217/+382
|\ \ | |/
| * MDEV-31181 Server crash in subselect_uniquesubquery_engine::print upon EXPLAI...Oleksandr Byelkin2023-05-043-0/+43
| * Fix of selectivity test to behave correctly with embedded and view protocols.Oleksandr Byelkin2023-05-047-217/+335
* | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-037-45/+1161
|\ \ | |/
| * MDEV-26301: Split optimization refills: Optimizer Trace coverageSergei Petrunia2023-05-034-13/+245
| * MDEV-26301 Split optimization refills temporary table too many timesIgor Babaev2023-05-035-32/+910
* | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-031-2/+6
|\ \ | |/
| * MDEV-29621 part 2 of post-merge fixes in galeraAndrei2023-05-031-1/+1
| * Protect a new condition (by Andrei)Oleksandr Byelkin2023-05-031-1/+5
* | Fix test after merge (by Thiru)Oleksandr Byelkin2023-05-032-2/+2
* | Merge branch '10.4' into 10.5Oleksandr Byelkin2023-05-021-0/+0
|\ \ | |/
| * Merge branch '10.3' into 10.4Oleksandr Byelkin2023-05-021-0/+0
| |\
| | * New CC 3.1mariadb-10.3.39bb-10.3-release10.3Oleksandr Byelkin2023-05-021-0/+0
* | | Merge branch 'bb-10.4-release' into bb-10.5-releaseOleksandr Byelkin2023-05-027-6/+72
|\ \ \ | |/ /
| * | Merge branch '10.4' into bb-10.4-releaseOleksandr Byelkin2023-05-027-6/+72
| |\ \
| | * | wsrep-lib external submodule updatebb-10.4-MDEV-30838-v2-galeraJulius Goryavsky2023-05-021-0/+0
| | * | MDEV-30838 Assertion `m_thd == _current_thd()'Daniele Sciascia2023-05-024-4/+43
| | * | MDEV-30414 sporadic failures with galera var retry autocommitsara2023-05-022-2/+29
* | | | MDEV-29621 manual merge from 10.4 -> 10.5Andrei2023-05-023-5/+26
* | | | Merge branch 'bb-10.4-release' into bb-10.5-releaseOleksandr Byelkin2023-05-0272-473/+1108
|\ \ \ \ | |/ / /
| * | | Merge branch '10.3' into 10.4Oleksandr Byelkin2023-05-0238-268/+624
| |\ \ \ | | |/ / | |/| / | | |/
| | * MDEV-29621: Replica stopped by locks on sequenceAndrei2023-04-278-13/+190
| | * New CCOleksandr Byelkin2023-04-261-0/+0
| | * Merge branch 'merge-zlib' into 10.3bb-10.3-sergSergei Golubchik2023-04-2028-252/+333
| | |\
| | | * 1.2.13Sergei Golubchik2023-04-2092-968/+674
| * | | MDEV-31153 New methods Schema::make_item_func_* for REPLACE, SUBSTRING, TRIMAlexander Barkov2023-04-297-74/+170
| * | | Adding "const" qualifiers to a few trivial Lex_input_string methodsAlexander Barkov2023-04-292-23/+23
| * | | MDEV-30221: Move environmental macros to before master-slavebb-10.4-MDEV-30221Angelique2023-04-289-14/+14
| * | | MDEV-31067: selectivity_from_histogram >1.0 for a DOUBLE_PREC_HB histogrambb-10.4-mdev31067-variant2Sergei Petrunia2023-04-285-53/+234
| * | | MDEV-22756 SQL Error (1364): Field 'DB_ROW_HASH_1' doesn't have a default valueSergei Golubchik2023-04-283-1/+14
| * | | MDEV-31113 Server crashes in store_length / Type_handler_string_result::make_...bb-10.4-mdev-31113Oleg Smirnov2023-04-283-2/+28
| * | | MDEV-31129 build failure with RocksDB, incompatible pointer to integer conver...Sergei Golubchik2023-04-271-1/+1
| * | | return accidentally removed in 45d4f6b97b4811b1b7783dcd19526be1dbb196dc commentbb-10.4-MDEV-30889Oleksandr Byelkin2023-04-271-0/+6
| * | | MDEV-30889: 3 - Item_in_optimizer leakOleksandr Byelkin2023-04-265-24/+33
| * | | MDEV-30889: 2 - Allocation in TABLE_SHARE::init_from_sql_statement_stringOleksandr Byelkin2023-04-261-15/+0
| * | | MDEV-30889: 1 - Allocation in Item_subselect::mark_as_dependentOleksandr Byelkin2023-04-261-2/+2
* | | | Merge branch 'merge-perfschema-5.7' into 10.5Oleksandr Byelkin2023-04-28274-274/+274
|\ \ \ \
| * | | | 5.7.42 (only copyright year in all files changed)Oleksandr Byelkin2023-04-28275-275/+275
* | | | | Merge 10.4 into 10.5Marko Mäkelä2023-04-2724-50/+533
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | MDEV-30218 update test resultSergei Golubchik2023-04-261-1/+1
| * | | | MDEV-11356 Option skip-core-file does not workSergei Golubchik2023-04-265-14/+9
| * | | | MDEV-30620 Trying to lock uninitialized LOCK_parallel_entryAndrei2023-04-251-3/+5
| * | | | MDEV-31121: ANALYZE statement produces 0 for all timings in embedded serverSergei Petrunia2023-04-253-0/+31
| * | | | MDEV-30430: Enabling system versioning on tables without primary key breaks r...Brandon Nesterenko2023-04-243-6/+73