summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* cleanup: s/const CHARSET_INFO/CHARSET_INFO/Sergei Golubchik2014-12-0420-34/+33
* cleanup: reuse MY_CHECK_AND_SET_COMPILER_FLAG in sphinx/CMakeLists.txtSergei Golubchik2014-12-041-4/+1
* cleanup: ptr_cmpSergei Golubchik2014-12-041-10/+10
* MDEV-6311 Add errors on CREATE SERVERSergei Golubchik2014-12-047-7/+54
* cleanup: freshen up CREATE SERVER codeSergei Golubchik2014-12-048-167/+114
* MDEV-6593 : domain_id based replication filtersNirbhay Choubey2014-12-0324-112/+2889
* followup for MDEV-6996, update tests and resultsSergei Golubchik2014-12-039-11/+21
* Move page initialization to better place.Jan Lindström2014-12-032-20/+0
* compiler warningSergei Golubchik2014-12-031-1/+1
* Merge branch '10.1' into bb-10.1-mergeSergei Golubchik2014-12-0347-692/+3412
|\
| * Fix Windows compiler error.Jan Lindström2014-12-031-1/+1
| * Fix compiler failure on fallocate function and used flags.Jan Lindström2014-12-038-114/+183
| * Fix buildbot valgrind errors on test innodb.innodb-page_compression_tablesJan Lindström2014-12-024-28/+20
| * MDEV-7015: SET STATEMENT old_passwords has no effectMDEV-7015Oleksandr Byelkin2014-12-026-77/+129
| * MDEV-6996: SET STATEMENT default_week_format = .. has no effectOleksandr Byelkin2014-12-027-9/+57
| * Make analyze_format_json.test work on case-insensitive FS.Sergei Petrunia2014-12-022-17/+17
| * Merge branch '10.1' of github.com:MariaDB/server into 10.1Sergei Petrunia2014-12-021-1/+1
| |\
| | * Update test results after fix for MDEV-7245Sergei Petrunia2014-12-021-1/+1
| * | Code cleanupSergei Petrunia2014-12-023-84/+31
| * | Update test results.Sergei Petrunia2014-12-021-1/+2
| * | EXPLAIN FORMAT=JSONSergei Petrunia2014-12-025-3/+123
| * | EXPLAIN FORMAT=JSON: Do set usable_key_parts for key in the temp. tableSergei Petrunia2014-12-021-0/+1
| * | Merge ../10.1 into bb-10.1-explain-jsonSergei Petrunia2014-12-0253-547/+1370
| |\ \ | | |/
| | * MDEV-7245: Incorrect display of subquery cache in union.resultSergei Petrunia2014-12-022-1/+4
| * | EXPLAIN FORMAT=JSON: support SJ-MaterializationSergei Petrunia2014-12-016-81/+251
| * | EXPLAIN FORMAT=JSON: support EXPLAIN FORMAT=JSON INSERT ...Sergei Petrunia2014-11-294-8/+60
| * | ANALYZE FORMAT=JSON: better output and testsSergei Petrunia2014-11-296-8/+270
| * | EXPLAIN FORMAT=JSON: Add support for non-merged semi-joinsSergei Petrunia2014-11-297-7/+117
| * | EXPLAIN FORMAT=JSON: support derived tablesSergei Petrunia2014-11-286-9/+141
| * | Make explain_json.test pass on case-insensitive FS.Sergei Petrunia2014-11-282-9/+9
| * | EXPLAIN FORMAT=JSON: Add support for single-table UPDATE/DELETE.Sergei Petrunia2014-11-289-197/+409
| * | EXPLAIN FORMAT=JSON: support join bufferingSergei Petrunia2014-11-275-12/+97
| * | EXPLAIN FORMAT=JSON: further developmentSergei Petrunia2014-11-279-14/+298
| * | Merge ../10.1-explain-json-r4 into 10.1Sergei Petrunia2014-11-2721-155/+1335
| |\ \
| | * | Make testsuite to passSergei Petrunia2014-11-213-4/+15
| | * | Better commentsSergei Petrunia2014-11-211-1/+7
| | * | Better commentsSergei Petrunia2014-11-202-0/+24
| | * | Merge ../10.1 into bb-10.1-explain-jsonSergei Petrunia2014-10-152523-564463/+53083
| | |\ \
| | * | | EXPLAIN FORMAT=JSON: produce used_key_parts, JSON-ish output for index_merge.Sergei Petrunia2014-08-146-46/+273
| | * | | EXPLAIN FORMAT=JSON: produce the 'ref' column.Sergei Petrunia2014-08-124-41/+49
| | * | | MDEV-6109: EXPLAIN JSONSergei Petrunia2014-08-124-25/+306
| | * | | MDEV-6109: EXPLAIN JSONSergei Petrunia2014-08-098-20/+100
| | * | | Merge 10.1 (with ANALYZE) and 10.1-explain-jsonSergei Petrunia2014-08-0915-104/+643
| | |\ \ \
| | | * | | MDEV-6109: EXPLAIN JSON10.1-explain-jsonSergei Petrunia2014-05-2715-111/+642
* | | | | | disable mroonga temporarily: see MDEV-7246Sergei Golubchik2014-12-023-10/+4
* | | | | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-022354-12489/+594800
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | put at least some output-generating statement in the testSergei Golubchik2014-12-022-0/+3
| * | | | | fix include/not_embedded.inc to be independent from the environmentSergei Golubchik2014-12-022-6/+3
| * | | | | MDEV-7251: Test failure in rpl.rpl_parallelKristian Nielsen2014-12-022-0/+12
| * | | | | Fix wording in error log message, to be consistent with other messages ("IO t...Kristian Nielsen2014-12-021-1/+1