summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2018-05-05178-2409/+3763
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2018-05-041-7/+15
| |\
| | * protocol: verify that number of rows is correctSergei Golubchik2018-05-041-7/+15
| * | compiler warningSergei Golubchik2018-05-041-7/+7
| * | MDEV-16084 Calling exit() from a signal handler is unsafe.Vladislav Vaintroub2018-05-031-8/+6
| * | bump the VERSIONDaniel Bartholomew2018-05-031-1/+1
| * | MDEV-16080 Crash in online table rebuild with concurrent DELETE of many BLOBsMarko Mäkelä2018-05-032-216/+36
| |\ \
| | * | Bug #25928471: ONLINE ALTER AND CONCURRENT DELETE ON TABLE WITH MANY TEXT COL...Mayank Prasad2018-05-032-216/+36
| |/ /
| * | Merge branch '5.5' into 10.0mariadb-10.0.35Sergei Golubchik2018-05-014-4/+22
| |\ \ | | |/
| | * Use after free in authenticationSergei Golubchik2018-05-014-2/+20
| | * Bug#25471090: MYSQL USE AFTER FREESergei Golubchik2018-04-301-2/+2
| * | Merge branch '5.5' into 10.0Sergei Golubchik2018-04-2915-24/+228
| |\ \ | | |/
| | * Bug#25471090: MYSQL USE AFTER FREESergei Golubchik2018-04-271-1/+1
| | * MDEV-15035 Wrong results when calling a stored procedureIgor Babaev2018-04-2510-15/+130
| | * MDEV-13699: Assertion `!new_field->field_name.str || strlen(new_field->field_...Oleksandr Byelkin2018-04-254-8/+98
| | * bump the VERSIONDaniel Bartholomew2018-04-231-1/+1
| * | List of unstable tests for 10.0.35 releaseElena Stepanova2018-04-261-67/+70
| * | Merge branch 'merge-pcre' into 10.0Sergei Golubchik2018-04-2619-337/+638
| |\ \
| | * | 8.42Sergei Golubchik2018-04-2456-3397/+5804
| * | | Squashed commit of connect/10.0:Sergei Golubchik2018-04-2697-1699/+2463
| * | | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2018-04-2622-58/+200
| |\ \ \
| | * | | 5.6.39-83.1Sergei Golubchik2018-04-2422-58/+200
| * | | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2018-04-269-41/+104
| |\ \ \ \
| | * | | | 5.6.39-83.1Sergei Golubchik2018-04-2411-51/+131
| * | | | | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2018-04-261-1/+1
| |\ \ \ \ \
| | * | | | | 5.6.40 (no changes)Sergei Golubchik2018-04-210-0/+0
| | * | | | | 5.6.39 (no changes)Vicențiu Ciorbaru2018-01-230-0/+0
| * | | | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2018-04-265-26/+54
| |\ \ \ \ \ \
| | * | | | | | 5.6.40Sergei Golubchik2018-04-215-32/+54
| * | | | | | | MDEV-15456 Server crashes upon adding or dropping a partition in ALTER under ...Sergei Golubchik2018-04-266-7/+8
| * | | | | | | Fix compilation error when compiling with valgrindMonty2018-04-261-1/+1
| * | | | | | | Increase number of max table_open_cache instancesMonty2018-04-262-3/+3
* | | | | | | | MDEV-16092 Crash in encryption.create_or_replaceMarko Mäkelä2018-05-044-10/+20
* | | | | | | | Merge pull request #731 from codership/MDEV-15803Jan Lindström2018-04-303-30/+18
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '10.1' into MDEV-15803Jan Lindström2018-04-307-73/+159
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #732 from codership/galera_gcs_fragment_auto_incJan Lindström2018-04-301-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Save / restore auto_increment_offset in test galera_gcs_fragmentDaniele Sciascia2018-04-271-0/+7
* | | | | | | | | | Merge pull request #729 from codership/MDEV-15794Jan Lindström2018-04-274-71/+143
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | MDEV-15794 Fix and re-enable test galera_var_retry_autocommitDaniele Sciascia2018-04-264-71/+143
* | | | | | | | | | | Merge pull request #730 from codership/MDEV-13549-fixes-for-galera_ist_mysqldumpJan Lindström2018-04-273-2/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | MDEV-13549 Record and re-enable galera_ist_mysqldumpDaniele Sciascia2018-04-263-2/+9
| |/ / / / / / / / /
| | * | | | | | | | MDEV-15803 Fix and re-enable test galera_var_auto_inc_control_onDaniele Sciascia2018-04-273-30/+18
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #723 from codership/10.1-MDEV-16005Jan Lindström2018-04-2714-106/+94
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MDEV-16005 sporadic failures with galera tests MW-328B and MW-328Csjaakola2018-04-2414-106/+94
* | | | | | | | | | Follow-up fix to MDEV-14705: Flush log at shutdownMarko Mäkelä2018-04-262-0/+6
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | MDEV-15809: Test failure on galera.MW-44Jan Lindström2018-04-263-7/+18
* | | | | | | | | Merge pull request #722 from codership/MDEV-16006Jan Lindström2018-04-252-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MDEV-16006 Fix test galera_kill_nochangesDaniele Sciascia2018-04-242-0/+10
* | | | | | | | | | Merge pull request #719 from codership/MDEV-15811Jan Lindström2018-04-252-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | MDEV-15811 Fix and re-enable test galera.galera_pc_ignore_sbDaniele Sciascia2018-04-242-3/+3
|/ / / / / / / / /