summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tempesta-tech-sysprg/10.1-MDEV-10754' into 10.1bb-10.1-MDEV-10754Jan Lindström2018-08-208-1/+379
|\
| * Merge branch 'sysprg/10.1-MDEV-10754' of https://github.com/tempesta-tech/mar...Jan Lindström2018-08-208-1/+379
| |\ |/ /
| * Fixes of the base patch for compatibility with the 10.1 branchJulius Goryavsky2018-08-172-27/+1
| * Reverting changes made to support the mtr under the rootJulius Goryavsky2018-08-132-11/+0
| * Fixes after review and correction of the problems caused by the fact that dur...Julius Goryavsky2018-08-098-7/+99
| * Merge branch '10.1' of https://github.com/MariaDB/server into sysprg/10.1-MDE...Julius Goryavsky2018-08-08166-1151/+3176
| |\
| * | MDEV-10754 wsrep_sst_rsync does not support innodb_data_home_dirJulius Goryavsky2018-07-264-1/+324
* | | This is patch for the https://jira.mariadb.org/browse/MDEV-9519 issue:Julius Goryavsky2018-08-1511-30/+677
* | | Merge pull request #844 from codership/10.1-MDEV-15933Jan Lindström2018-08-153-6/+9
|\ \ \
| * | | MDEV-15933 Cannot resume Node SYNCED state when wsrep_desync is done after FTWRLmkaruza2018-08-143-6/+9
* | | | MDEV-16220 Do not pass UTF8 to mysql in command line parameters, on WindowsVladislav Vaintroub2018-08-144-6/+10
* | | | MDEV-15869 Mariabackup is lacking some dependencies declaration (#771)faust2018-08-091-1/+3
| |_|/ |/| |
* | | bump the VERSIONDaniel Bartholomew2018-08-071-1/+1
* | | MDEV-13333: Deadlock failure that does not occur elsewhereJan Lindström2018-08-062-4/+6
* | | Fix galera test MW-44Jan Lindström2018-08-052-18/+8
* | | MDEV-15433: Optimizer does not use group by optimization with distinctVarun Gupta2018-08-058-37/+89
* | | Merge pull request #609 from benrubson/stunnelJan Lindström2018-08-051-7/+60
|\ \ \
| * | | Use stunnel during rsync SST if availablebenrubson2018-02-121-7/+60
* | | | MDEV-16544 - crash in ha_sphinx::create()mariadb-10.1.35Vladislav Vaintroub2018-08-041-1/+1
* | | | Updated list of unstable tests for 10.1.35 releaseElena Stepanova2018-08-041-62/+111
* | | | Fix gcc 7.3 compiler warnings.Oleksandr Byelkin2018-08-037-8/+27
* | | | Disable an unstable testOleksandr Byelkin2018-08-031-0/+1
* | | | Fix -Wclass-memaccess in WSREP,InnoDB,XtraDBMarko Mäkelä2018-08-0310-42/+44
* | | | Merge 10.0 into 10.1Marko Mäkelä2018-08-0316-16/+36
|\ \ \ \
| * | | | Fix -Wclass-memaccess warnings in InnoDB,XtraDBMarko Mäkelä2018-08-0314-12/+34
| * | | | Follow-up fix to MDEV-16865: InnoDB fts_query() ignores KILLMarko Mäkelä2018-08-032-2/+2
| * | | | bump the VERSIONDaniel Bartholomew2018-08-011-1/+1
* | | | | fix galera test.Oleksandr Byelkin2018-08-021-0/+97
* | | | | Merge 10.0 into 10.1Marko Mäkelä2018-08-0112-40/+124
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-16865 InnoDB fts_query() ignores KILLMarko Mäkelä2018-08-018-6/+92
| * | | | Fix function pointer type mismatchMarko Mäkelä2018-08-014-32/+32
| * | | | Unstable tests for 10.0.36 release, latest additionsmariadb-10.0.36Elena Stepanova2018-07-311-2/+7
* | | | | Merge 10.0 into 10.1Marko Mäkelä2018-07-3116-462/+496
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-16855 Fix fts_sync_synchronization in InnoDBMarko Mäkelä2018-07-3014-440/+450
| * | | | Apply the 5.6.40 security fixes to XtraDBMarko Mäkelä2018-07-302-20/+43
| * | | | Merge 5.5 into 10.0Marko Mäkelä2018-07-301-1/+2
| |\ \ \ \
| | * | | | (no commit message)mariadb-5.5.61Karthik Kamath2018-07-301-1/+3
* | | | | | Merge branch '10.0' into 10.1Oleksandr Byelkin2018-07-3140-185/+1181
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge InnoDB MySQL 5.6.41 to 10.0Marko Mäkelä2018-07-305-73/+117
| |\ \ \ \ \
| | * | | | | Bug #27326796 - MYSQL CRASH WITH INNODB ASSERTION FAILURE IN FILE PARS0PARS.CCSachin Agarwal2018-07-304-72/+116
| |/ / / / /
| * | | | | Merge 5.5 into 10.0Marko Mäkelä2018-07-3016-18/+400
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'mysql/5.5' into 5.5Oleksandr Byelkin2018-07-2911-47/+123
| | |\ \ \ \
| | | * | | | Bug#27980823: HEAP OVERFLOW VULNERABILITIES IN MYSQL CLIENT LIBRARYmysql-5.5.61Ivo Roylev2018-06-151-1/+3
| | | * | | | Bug#25541037: MYSQL BUG ON DELETEArun Kuruvila2018-05-213-3/+15
| | | * | | | Bug#27759871: BACKRONYM ISSUE IS STILL IN MYSQL 5.7Arun Kuruvila2018-05-143-2/+49
| | | * | | | Bug#27230925: HANDLE_FATAL_SIGNAL (SIG=11) INArun Kuruvila2018-05-103-31/+65
| | | * | | | Bug#27407480: AUTOMATIC_SP_PRIVILEGES REQUIRES NEED THEArun Kuruvila2018-04-242-13/+5
| | | * | | | Bug#27197235 USER VARIABLE + UINON + DECIMAL COLUMN RETURNSAjo Robert2018-04-103-1/+32
| | | * | | | Bug#27510150: MYSQLDUMP FAILS FOR SPECIFIC --WHERE CLAUSESArun Kuruvila2018-04-091-40/+142
| | | * | | | Raise version number after cloning 5.5.60Balasubramanian Kandasamy2018-02-261-1/+1