summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-10954: sles11 does not have 'which' package (post-fix)bb-10.1-nirbhayNirbhay Choubey2017-01-171-3/+8
* Merge branch '10.0' into 10.1mariadb-10.1.21Sergei Golubchik2017-01-1711-55/+122
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2017-01-179-51/+118
| |\
| | * bugfix: Item_func_min_max stored thd internallySergei Golubchik2017-01-154-6/+28
| | * bugfix: cmp_item_row::alloc_comparators() allocated on the wrong arenaSergei Golubchik2017-01-156-34/+20
| | * MDEV-9690 concurrent queries with virtual columns crash in temporal codeSergei Golubchik2017-01-154-18/+77
| * | connect: compilation errors and few obvious bugsSergei Golubchik2017-01-172-6/+7
* | | MDEV-11601 Out-of-bounds string access in create_schema_table()Sergei Golubchik2017-01-171-1/+1
* | | MDEV-11698 Old Bug possibly not fixed; BEFORE INSERT Trigger on NOT NULLSergei Golubchik2017-01-177-61/+119
* | | selinux fixes for 10.0->10.1 mergeSergei Golubchik2017-01-173-19/+19
* | | mysql_install_db enhancements to facilitate Debian bug#848616 fixKristian Nielsen2017-01-173-22/+69
* | | Merge branch '10.0' into 10.1Kristian Nielsen2017-01-171-0/+1
|\ \ \ | |/ /
| * | MDEV-11811: dual master with parallel replication memory leak in write masterKristian Nielsen2017-01-171-0/+1
* | | MDEV-10956 Strict Password Validation Breaks Replication.Alexey Botchkov2017-01-173-4/+42
* | | Merge remote-tracking branch 'origin/10.1' into 10.1Vicențiu Ciorbaru2017-01-171-14/+14
|\ \ \
| * | | MDEV-11623 follow-up: Adjust one more test.Marko Mäkelä2017-01-161-14/+14
* | | | Post merge review fixesVicențiu Ciorbaru2017-01-1713-239/+23
* | | | Post merge fix sysvars_innodb for xtradbVicențiu Ciorbaru2017-01-171-0/+5
* | | | MDEV-11711: ArmHF EXPLAIN JSON garbage longlong values printedVicențiu Ciorbaru2017-01-161-4/+4
* | | | MDEV-11712: ArmHF EXPLAIN JSON garbage longlong values printedVicențiu Ciorbaru2017-01-161-1/+1
* | | | Merge remote-tracking branch 'origin/10.1' into 10.1bb-10.1-vicentiu-galeraVicențiu Ciorbaru2017-01-1669-2035/+2030
|\ \ \ \ | |/ / /
| * | | MDEV-11623 follow-up: Adjust tests.Marko Mäkelä2017-01-163-6/+8
| * | | 101_compatibility test fails on CentOS 5Elena Stepanova2017-01-161-1/+1
| * | | Updated list of unstable tests for 10.1.21Elena Stepanova2017-01-161-55/+89
| * | | MDEV-11623 MariaDB 10.1 fails to start datadir created withMarko Mäkelä2017-01-1539-1497/+1483
| * | | MDEV-11799 InnoDB can abort if the doublewrite bufferMarko Mäkelä2017-01-1514-295/+191
| * | | MDEV-8139: Disable a randomly failing test until the code is fixed.Marko Mäkelä2017-01-151-1/+2
| * | | MDEV-11551 Server crashes in Field::is_real_nullSergei Golubchik2017-01-153-1/+25
| * | | max_session_mem_used server variableSergei Golubchik2017-01-159-174/+226
| * | | bugfix: mutex order violation in embeddedSergei Golubchik2017-01-151-1/+1
| * | | cleanup: make malloc_size_cb_func always definedSergei Golubchik2017-01-152-10/+10
* | | | Merge remote-tracking branch '10.0-galera' into 10.1Vicențiu Ciorbaru2017-01-165-8/+15
|\ \ \ \
| * | | | Fix for post-merge build failure.mariadb-galera-10.0.29Nirbhay Choubey2017-01-131-13/+2
| * | | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-13344-5710/+13090
| |\ \ \ \
| * | | | | MDEV-11636 Extra persistent columns on slave always gets NULL in RBRSachin Setiya2016-12-284-0/+358
| * | | | | MDEV-11490 Galera_3nodes test suite does not suppress Warnings.Sachin Setiya2016-12-211-1/+3
| * | | | | MDEV-11479 Improved wsrep_dirty_readsSachin Setiya2016-12-149-9/+191
| * | | | | Revert "MDEV-11016 wsrep_node_is_ready() check is too strict"Sachin Setiya2016-12-143-33/+0
| * | | | | Fix failing tests.Nirbhay Choubey2016-12-097-84/+60
| * | | | | Fix build failure.Nirbhay Choubey2016-12-051-1/+1
| * | | | | MDEV-11016 wsrep_node_is_ready() check is too strictSachinSetiya2016-12-013-0/+24
| * | | | | bump the VERSIONDaniel Bartholomew2016-11-071-1/+1
| * | | | | Disable unstable galera_concurrent_ctas test.mariadb-galera-10.0.28Nirbhay Choubey2016-11-021-0/+1
| * | | | | Fix a build failure noticed on Yakkety.Nirbhay Choubey2016-11-022-4/+4
* | | | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-16180-2460/+10539
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-1412-38/+58
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | MDEV-11527 Virtual columns do not get along well with NO_ZERO_DATESergei Golubchik2017-01-123-1/+19
| | * | | MDEV-11706 Assertion `is_stat_field || !table || (!table->write_set || bitmap...Sergei Golubchik2017-01-119-39/+39
| * | | | bump the VERSIONDaniel Bartholomew2017-01-131-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.29Vicențiu Ciorbaru2017-01-12168-2428/+10266
| |\ \ \