summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-12379: Server crashes in TABLE_LIST::is_with_table on SHOW CREATE VIEWbb-10.2-MDEV-12379Oleksandr Byelkin2017-04-073-1/+26
* Remove the unused variable trx_t::support_xa.Marko Mäkelä2017-04-075-27/+30
* use log-error in mtr, don't let mysqld to write to stderrSergei Golubchik2017-04-0712-63/+19
* cleanup: unused method LOGGER::flush_logsSergei Golubchik2017-04-072-18/+0
* ASAN error in rpl.mysql-wsrep#110-2Sergei Golubchik2017-04-072-1/+2
* ASAN errors in many rpl testsSergei Golubchik2017-04-072-3/+5
* MDEV-11995 ALTER TABLE proceeds despite reporting ER_TOO_LONG_KEY errorSergei Golubchik2017-04-0710-41/+64
* MDEV-12452 postfix - use C style cast, not reinterpret_castVladislav Vaintroub2017-04-071-1/+1
* Fix building aws_key_management on LinuxVladislav Vaintroub2017-04-061-3/+0
* MDEV-12452 MDEV-12453 : Fix building rocksdb and aws_key_management on macOSVladislav Vaintroub2017-04-065-8/+20
* Fixed the bug mdev-12440.Igor Babaev2017-04-063-0/+48
* travis: osx - specify allowed_failures accuratelyDaniel Black2017-04-061-0/+7
* travis: OSX - 2 minute test case timeoutDaniel Black2017-04-061-1/+4
* Travis: Add OSX to tests (but allow failure)Daniel Black2017-04-061-10/+38
* MDEV-6262: travis coverity supportDaniel Black2017-04-061-0/+33
* Travis: remove tokudb when building with clangDaniel Black2017-04-061-1/+2
* Travis: remove Mroonga for clangDaniel Black2017-04-061-0/+4
* Travis: add ccache for clangDaniel Black2017-04-061-1/+1
* travis: disable main.mysqlhotcopy_myisam in container buildsDaniel Black2017-04-061-0/+3
* Travis: llvm, additional packages and containerDaniel Black2017-04-062-12/+35
* Merge branch '10.1' into 10.2Vladislav Vaintroub2017-04-061-5/+7
|\
| * Do not link client plugins to mysqldVladislav Vaintroub2017-04-061-5/+7
* | Merge 10.1 into 10.2Marko Mäkelä2017-04-0624-70/+566
|\ \ | |/
| * MDEV-12198 innodb_defragment=1 crashes server on OPTIMIZE TABLE when FULLTEXT...Marko Mäkelä2017-04-068-20/+77
| * Merge 10.0 into 10.1Marko Mäkelä2017-04-0613-48/+454
| |\
| | * MDEV-8642: WHERE Clause not applied on View - Empty result set returnedOleksandr Byelkin2017-04-053-13/+75
| | * Import two ALTER TABLE…ALGORITHM=INPLACE tests from MySQL 5.6.Marko Mäkelä2017-04-056-2/+264
| | * Compiling, Windows . Avoid unnecessary rebuilds with MSVC.Vladislav Vaintroub2017-04-033-29/+111
| | * Windows : Fix compiling with VS2013Vladislav Vaintroub2017-04-031-5/+5
| * | fix warning "ignoring return value" of fwrite.Jan Lindström2017-04-051-1/+5
| * | Merge pull request #352 from grooverdan/10.1-xtradb-fil_crypt_rotate_pageJan Lindström2017-04-051-1/+1
| |\ \
| | * | xtradb: fil_crypt_rotate_page, space_id should be compared to TRX_SYS_SPACE n...Daniel Black2017-04-051-1/+1
| |/ /
| * | Merge pull request #350 from grooverdan/10.1-TRX_SYS_PAGE_NOJan Lindström2017-04-051-1/+1
| |\ \
| | * | fil_crypt_rotate_page - space_id should be compared to TRX_SYS_SPACE not spaceDaniel Black2017-04-041-1/+1
* | | | bump the VERSIONDaniel Bartholomew2017-04-051-1/+1
* | | | Make InnoDB doublewrite buffer creation more robust.Marko Mäkelä2017-04-051-17/+9
* | | | Adjust tests for the removal of kill_and_restart_mysqld.inc.Marko Mäkelä2017-04-054-4/+6
* | | | MDEV-11840 InnoDB: "Cannot open <ib_buffer_pool file>" should not be an errorMarko Mäkelä2017-04-051-1/+1
* | | | Merge ../10.2-mariarocks into 10.2mariadb-10.2.5Sergei Petrunia2017-04-041-0/+7
|\ \ \ \
| * | | | MariaRocks: temporarily disable 32-bit Windows buildsSergei Petrunia2017-04-041-0/+7
* | | | | Windows, compiling : Remove _DEBUG preprocessor constant, to fixVladislav Vaintroub2017-04-041-0/+5
|/ / / /
* | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-04-0417-151/+1965
|\ \ \ \
| * | | | Fix aws_key_management compilation after mismergeVladislav Vaintroub2017-04-041-6/+7
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-04-0410-137/+141
| |\ \ \ \ | | |/ / /
| | * | | MDEV-12428 SIGSEGV in buf_page_decrypt_after_read() during DDLMarko Mäkelä2017-04-038-119/+108
| | * | | fix Ninja builds for AWS SDKSergei Golubchik2017-03-311-10/+13
| | * | | put all aws_key_management plugin files into plugin/aws_key_managementSergei Golubchik2017-03-312-4/+7
| | * | | AWS KMS plugin : Fix building in case AWS C++ SDK was preinstalledVladislav Vaintroub2017-03-311-10/+14
| | |/ /
| * | | Fixed bug mdev-10454.Igor Babaev2017-04-037-13/+1822
* | | | MDEV-12439: (Temporary) Don't run MariaRocks tests under valgrindSergei Petrunia2017-04-042-0/+6