summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \
| | * \ \ Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-1215-5/+116
| | |\ \ \ | | | |/ /
| | | * | MDEV-11685: sql_mode can't be set with non-ascii connection charsetNirbhay Choubey2017-01-117-1/+57
| | | * | MDEV-11676 Starting service with mysqld_safe_helper fails in SELINUX "enforci...Sergei Golubchik2017-01-117-2/+52
| | | * | mysqld_safe: don't close stdout if set -xSergei Golubchik2017-01-101-2/+7
| | * | | Update mysql_secure_installation man pageiangilfillan2017-01-101-4/+68
| | * | | Fix unit test after merge from mysql 5.5.35 perfschemaVicențiu Ciorbaru2017-01-101-0/+1
| | * | | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-01-104-0/+38
| | |\ \ \ | | | |/ /
| | | * | Adding LOAD DATA tests for MDEV-11079 and MDEV-11631Alexander Barkov2017-01-094-0/+38
| | * | | Fix problems from 5.5 mergeVicențiu Ciorbaru2017-01-104-3/+4
| | * | | Merge remote-tracking branch 'merge/merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-01-105-64/+129
| | |\ \ \
| | | * | | 5.6.35Vicențiu Ciorbaru2017-01-075-64/+129
| | | * | | 5.6.34Sergei Golubchik2016-10-250-0/+0
| | * | | | Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0vicentiu2017-01-1012-60/+188
| | |\ \ \ \
| | | * | | | 5.6.35vicentiu2017-01-0712-60/+188
| | | * | | | 5.6.34Sergei Golubchik2016-10-250-0/+0
| | * | | | | Merge remote-tracking branch 'connect/10.0' into bb-10.0-vicentiuvicentiu2017-01-0655-1866/+8797
| | |\ \ \ \ \
| | | * | | | | Modified version numberOlivier Bertrand2016-12-251-1/+1
| | | * | | | | Merge branch '10.0' of https://github.com/MariaDB/server into ob-10.0Olivier Bertrand2016-12-24429-5418/+12770
| | | |\ \ \ \ \
| | | * | | | | | Fix some XML table type bugs:Olivier Bertrand2016-12-2317-278/+604
| | | * | | | | | - MDEV-11295: developing handling files contained in ZIP file.Olivier Bertrand2016-12-1410-97/+64
View Lorry Controller Status