summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-27036: allow Json_writer_[array|object] from Json_writerbb-10.4-MDEV-23766Sergei Krivonos2021-11-141-9/+25
* MDEV-23805 Make Online DDL to Instant DDL when table is emptybb-10.4-MDEV-23805Thirunarayanan Balathandayuthapani2021-11-1223-13/+73
* Merge branch '10.3' into 10.4Vladislav Vaintroub2021-11-123-5/+13
|\
| * Merge branch '10.2' into 10.3Vladislav Vaintroub2021-11-123-5/+13
| |\
| | * MDEV-27030 vcol.vcol_keys_myisam fails on Windows x64, with Visual Studio 2022Vladislav Vaintroub2021-11-111-0/+8
| | * MDEV-26991: CURRENT_TEST: main.mysql_binary_zero_insert 'grep' is not recogni...bb-10.2-MDEV-26991Brandon Nesterenko2021-11-112-5/+5
* | | MDEV-23766: fix by assert (Windows)Sergei Krivonos2021-11-102-14/+13
* | | MDEV-23766: Re-add Json_writer unit test.Sergei Petrunia2021-11-092-2/+4
* | | In case WITH_WSREP is enabled, build wsrep as pluginVladislav Vaintroub2021-11-093-13/+8
* | | improve build, allow sql library to be built in parallel with builtinsVladislav Vaintroub2021-11-094-8/+49
* | | Add new option NOT_EMBEDDED, for pluginsVladislav Vaintroub2021-11-093-8/+20
* | | Revert "improve build, allow sql library to be built in parallel with builtins"Sergei Krivonos2021-11-094-49/+8
* | | Revert "In case WITH_WSREP is enabled, build wsrep as plugin"Sergei Krivonos2021-11-093-8/+13
* | | MDEV-23766: buildfix: postpone new unittest until its dependency resolutionSergei Krivonos2021-11-091-4/+0
* | | MDEV-23766: fix by my_json_writer testSergei Krivonos2021-11-093-21/+19
* | | MDEV-23766: Make Json_writer assert when one tries to author invalid JSONSergei Petrunia2021-11-094-8/+163
* | | MDEV-23766: Make Json_writer assert when one tries to author invalid JSONSergei Petrunia2021-11-092-27/+17
* | | In case WITH_WSREP is enabled, build wsrep as pluginVladislav Vaintroub2021-11-093-13/+8
* | | improve build, allow sql library to be built in parallel with builtinsVladislav Vaintroub2021-11-094-8/+49
* | | MDEV-23766: add Json_writer consistency asserts to check array/object sequenceSergei Krivonos2021-11-092-42/+116
* | | MDEV-23766: Fix get_best_disjunct_quick by assert:Sergei Krivonos2021-11-091-4/+6
* | | MDEV-23766: Fix fix_semijoin_strategies_for_picked_join_order by assertSergei Krivonos2021-11-091-3/+3
* | | Merge 10.3 into 10.4Marko Mäkelä2021-11-0946-65/+1534
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-11-0929-35/+1362
| |\ \ | | |/
| | * Remove a warning for clang 11 or earlierMarko Mäkelä2021-11-092-2/+2
| | * Remove restarts from encrypt_and_grep testst-10.2-mergeMarko Mäkelä2021-11-092-10/+12
| | * Merge mariadb-10.2.41 into 10.2Marko Mäkelä2021-11-0923-277/+477
| | |\
| | * | MDEV-26561 mariabackup release locksDaniel Black2021-11-091-0/+7
| | * | MDEV-26561 Fix a bug due to unreleased lockryancaicse2021-11-091-0/+1
| | * | bump the VERSIONbb-10.2-bumpversionDaniel Bartholomew2021-11-081-1/+1
| | * | MDEV-22522 RPM packages have meaningless summary/descriptionAlexey Bychko2021-11-081-6/+67
| | * | MDEV-25610 Assertion `escape != -1' failed in Item_func_like::val_intbb-10.2-bar-MDEV-25610Alexander Barkov2021-11-086-2/+1123
| | * | appveyor - do not use buggy cygwin bison.Vladislav Vaintroub2021-11-041-1/+7
| | * | Revert "MDEV-19129: Xcode compatibility update: deprecated vfork -> fork"Sergei Krivonos2021-11-031-1/+1
| | * | MDEV-22284 Aria table key read crash because wrong index usedbb-10.2-midenok2Aleksey Midenkov2021-11-023-1/+31
| | * | MDEV-24335 Unexpected question mark in the end of a TINYTEXT columnAlexander Barkov2021-11-023-2/+22
| | * | MDEV-26949 --debug-gdb installs redundant signal handlersMarko Mäkelä2021-11-012-2/+2
| | * | MDEV-19129: Xcode compatibility update: #include <editline/readline.h> pathSergei Krivonos2021-10-311-1/+5
| | * | MDEV-19129: Xcode compatibility update: deprecated vfork -> forkSergei Krivonos2021-10-311-1/+1
| | * | MDEV-24901 SIGSEGV in fts_get_table_name, SIGSEGV in ib_vector_size, SIGSEGV ...bb-10.2-bar-MDEV-24901Alexander Barkov2021-10-295-4/+81
| | * | MDEV-26833 Missed statement rollback in case transaction drops or create temp...bb-10.2-andreiAndrei Elkin2021-10-289-51/+1211
| | * | rpl_get_master_version_and_clock and rpl_row_big_table_id tests are slow, so ...Alice Sherepa2021-10-282-0/+2
| * | | Merge mariadb-10.3.32 into 10.3Marko Mäkelä2021-11-0938-368/+1749
| |\ \ \
| * | | | bump the VERSIONbb-10.3-bumpversionDaniel Bartholomew2021-11-081-1/+1
| * | | | MDEV-26928 Column-inclusive WITH SYSTEM VERSIONING doesn't work with explicit...Aleksey Midenkov2021-11-023-5/+47
| * | | | MDEV-25552 system versioned partitioned by LIMIT tables break CHECK TABLEAleksey Midenkov2021-11-022-7/+3
| * | | | MDEV-25803 innodb.alter_candidate_key fixAleksey Midenkov2021-11-024-10/+24
| * | | | MDEV-25803 Inplace ALTER breaks MyISAM/Aria table when order of keys is changedAleksey Midenkov2021-11-025-4/+92
* | | | | Merge branch '10.4' into bb-10.4-releaseOleksandr Byelkin2021-11-089-5/+62
|\ \ \ \ \
| * | | | | bump the VERSIONDaniel Bartholomew2021-11-081-1/+1