summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-14398 When innodb_encryption_rotate_key_age=0 is set,bb-10.1-MDEV-14398Thirunarayanan Balathandayuthapani2018-08-062-0/+13
* MDEV-14398 When innodb_encryption_rotate_key_age=0 is set,Thirunarayanan Balathandayuthapani2018-08-067-15/+129
* MDEV-14398 When innodb_encryption_rotate_key_age=0 is set,Thirunarayanan Balathandayuthapani2018-08-058-306/+134
* MDEV-14398 When innodb_encryption_rotate_key_age=0 is set,Thirunarayanan Balathandayuthapani2018-08-0518-296/+201
* 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
| | * | Fix added along with a test for a case missed in the patch for MDEV-16751Varun Gupta2018-07-274-4/+47
| | * | MDEV-15454: Nested SELECT IN returns wrong resultsVarun Gupta2018-07-254-0/+190
| | * | MDEV-16751: Server crashes in st_join_table::cleanup or TABLE_LIST::is_with_t...Varun Gupta2018-07-255-2/+105
| | * | MDEV-16820 Lost 'Impossible where' from query with inexpensive subqueryIgor Babaev2018-07-248-0/+107
| * | | Fix InnoDB/XtraDB warnings by GCC 8.2.0Marko Mäkelä2018-07-3010-60/+48
| * | | MDEV-16851 On schema mismatch in IMPORT TABLESPACE, display ROW_FORMAT in cle...Marko Mäkelä2018-07-304-24/+608
| * | | Use a more precise argument for memset()Marko Mäkelä2018-07-302-2/+2
| * | | MDEV-16820 Lost 'Impossible where' from query with inexpensive subqueryIgor Babaev2018-07-249-0/+123
| * | | List of unstable tests for 10.0.36 releaseElena Stepanova2018-07-241-67/+89
* | | | MDEV-16831: Galera test failure on galera_sst_mysqldump_with_keybb-10.1-MDEV-16831Jan Lindström2018-07-272-5/+97
* | | | Merge branch '10.1' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-269-0/+123
|\ \ \ \
| * | | | MDEV-16820 Lost 'Impossible where' from query with inexpensive subqueryIgor Babaev2018-07-249-0/+123
* | | | | Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-2561-265/+799
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | make plugins.processlist more robustOleksandr Byelkin2018-07-242-5/+4
| * | | fix plugins.processlistOleksandr Byelkin2018-07-241-1/+2
| * | | Merge pull request #726 from fauust/10.0-MDEV-14672Oleksandr "Sanja" Byelkin2018-07-241-2/+2
| |\ \ \
| | * \ \ Merge branch '10.0-MDEV-14672' of github.com:fauust/mariadb into 10.0-MDEV-14672Faustin Lammler2018-06-13350-4842/+6898
| | |\ \ \
| | | * | | Package dependency case problemFaustin Lammler2018-06-051-2/+2
| | * | | | Package dependency case problemFaustin Lammler2018-04-031-2/+2
| * | | | | Merge branch '5.5' into bb-10.0-merge-sanjaOleksandr Byelkin2018-07-238-6/+154
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | MDEV-16726 Assertion `tab->type == JT_REF || tab->type == JT_EQ_REF' failedIgor Babaev2018-07-195-3/+151
| | * | | | MDEV-15050 scripts: mysql_install_db.{sh|pl}, mysqld_multi - mysqld is in @sb...Daniel Black2018-07-163-3/+3
| * | | | | MDEV-15551 Server hangs or assertion `strcmp(share->unique_file_name,filename...Sergei Golubchik2018-07-193-1/+19
| * | | | | MDEV-14882 mysql_upgrade performs unnecessary conversions back and forthSergei Golubchik2018-07-191-20/+30