summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* InnoDB: Remove thread_mutexMarko Mäkelä2017-06-065-52/+6
* Remove traces of multiple InnoDB redo logsMarko Mäkelä2017-06-065-247/+161
* Remove an orphan declaration lock_rec_enqueue_waiting()Marko Mäkelä2017-06-061-26/+0
* Remove unused declarationsMarko Mäkelä2017-06-061-22/+0
* Fix some printf format type mismatchMarko Mäkelä2017-06-067-20/+22
* Adjust storage_engine suite according to server changes in 10.2Elena Stepanova2017-06-0318-761/+131
* MDEV-11623 merge fix: Use the correct flags in an error messagebb-10.2-mdev-6076Marko Mäkelä2017-05-291-1/+1
* MDEV-12924: re-add numa to innodbDaniel Black2017-05-291-0/+2
* Remove dict_index_t::is_ngramMarko Mäkelä2017-05-2611-128/+12
* fts_is_charset_cjk(): Do not call strcmp()Marko Mäkelä2017-05-261-13/+9
* Remove some noise from ib::fatal() and ib::fatal_or_error()Marko Mäkelä2017-05-261-3/+6
* Remove ut_allocator::m_oom_fatalMarko Mäkelä2017-05-261-39/+12
* Actually enable UNIV_DEBUG_VALGRINDMarko Mäkelä2017-05-261-2/+2
* Remove an unused variableMarko Mäkelä2017-05-261-2/+0
* Fix WITH_INNODB_EXTRA_DEBUGMarko Mäkelä2017-05-261-2/+2
* Merge 10.1 into 10.2Marko Mäkelä2017-05-2615-241/+209
|\
| * MDEV-12926 encryption.innodb_onlinealter_encryption, encryption.innodb-bad-ke...Marko Mäkelä2017-05-262-2/+2
| * 10.1 additions for MDEV-12052 Shutdown crash presumably due to master thread ...Marko Mäkelä2017-05-2610-58/+71
| * Merge 10.0 to 10.1Marko Mäkelä2017-05-262-176/+118
| |\
| | * MDEV-12052 Shutdown crash presumably due to master thread activityMarko Mäkelä2017-05-262-176/+118
| * | MDEV-11335 Changing delay_key_write option for MyISAM table should not copy rowsSergei Golubchik2017-05-241-4/+6
| * | MDEV-11311 Create federated table does not work as expected.Sergei Golubchik2017-05-241-1/+1
| * | MDEV-12625 total_index_blocks is uninitialized in ALTER TABLE…ALGORITHM=INP...Marko Mäkelä2017-05-232-0/+2
| * | MDEV-11264 Fix DeviceIoControl() usage in innodb.Vladislav Vaintroub2017-05-231-9/+14
* | | Merge 10.1 into 10.2Marko Mäkelä2017-05-23244-5174/+7081
|\ \ \ | |/ /
| * | Merge 10.0 into 10.1Marko Mäkelä2017-05-2340-106/+124
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0mariadb-10.0.31Sergei Golubchik2017-05-201-8/+17
| | |\
| | | * Make IF clear.Oleksandr Byelkin2017-05-181-8/+17
| | * | compilation warnings in ConnectSergei Golubchik2017-05-1929-72/+71
| | * | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-1912-27/+37
| * | | MDEV-12615: InnoDB page compression method snappy mostly does not compress pagesJan Lindström2017-05-2010-150/+194
| * | | After-merge fix for MDEV-11638Marko Mäkelä2017-05-205-6/+15
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-05-20221-4925/+6792
| |\ \ \ | | |/ /
| | * | Remove dead code added in merge commit d8b45b0c004edc0b91029b232d7cc9aad02cc822Marko Mäkelä2017-05-191-24/+0
| | * | Update xtradb and innodb version to 5.6.36Vicențiu Ciorbaru2017-05-182-2/+2
| | * | Fix xtradb handler compilation post mergeVicențiu Ciorbaru2017-05-181-0/+25
| | * | Merge remote-tracking branch 'origin/10.0' into 10.0Vicențiu Ciorbaru2017-05-1879-542/+444
| | |\ \
| | * | | Fix windows compilation in xtradb post-mergeVicențiu Ciorbaru2017-05-171-5/+5
| | * | | Fix tokudb test failures post mergeVicențiu Ciorbaru2017-05-1714-1/+13
| | * | | Merge branch 'merge-innodb-5.6' into bb-10.0-vicentiuVicențiu Ciorbaru2017-05-1730-272/+505
| | |\ \ \
| | | * | | 5.6.36Vicențiu Ciorbaru2017-05-1531-292/+658
| | * | | | Revert "Fix unit test after merge from mysql 5.5.35 perfschema"Vicențiu Ciorbaru2017-05-171-1/+0
| | * | | | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-05-1741-434/+1204
| | |\ \ \ \
| | | * | | | 5.6.36-82.0Vicențiu Ciorbaru2017-05-1642-459/+1419
| | * | | | | Remove tokudb_dir_cmd variableVicențiu Ciorbaru2017-05-161-71/+0
| | * | | | | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-05-1634-187/+1816
| | |\ \ \ \ \
| | | * | | | | 5.6.36-82.0Vicențiu Ciorbaru2017-05-1635-190/+1817
| | * | | | | | Update perfschema version to 5.6.36 post-mergeVicențiu Ciorbaru2017-05-161-1/+1
| | * | | | | | Merge remote-tracking branch 'connect/10.0' into 10.0Vicențiu Ciorbaru2017-05-16102-4083/+3563
| | |\ \ \ \ \ \
| | | * | | | | | MDEV-12651: change error code to ER_ILLEGAL_HA in rnd_pos (ha_connect.cc)Olivier Bertrand2017-05-121-1/+1