summaryrefslogtreecommitdiff
path: root/include/mysql
Commit message (Expand)AuthorAgeFilesLines
* Merge InnoDB 5.7 from mysql-5.7.9.Jan Lindström2016-09-022-0/+302
* Merge branch '10.1' into 10.2Sergei Golubchik2016-06-305-0/+42
|\
| * MDEV-9618 solaris sparc build fails on 10.1.Alexey Botchkov2016-05-045-0/+42
* | Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2Monty2016-04-286-6/+13
|\ \ | |/
| * Fixed wrong counting of global Memory_usedMonty2016-04-286-6/+13
* | Merge branch '10.1' into 10.2Sergei Golubchik2016-03-231-1/+1
|\ \ | |/
| * Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-1/+1
| |\
| | * Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-1/+1
* | | MDEV-9651 - Simplify audit event dispatchingSergey Vojtovich2016-03-082-2/+2
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-251-3/+3
|\ \ \ | |/ /
| * | Fix to ensure updates in gtid_slave_state table do not get binlogged.Nirbhay Choubey2016-02-241-3/+3
* | | Fix compilation10.2-sslVladislav Vaintroub2016-02-101-1/+1
* | | MDEV-6150 Speed up connection speed by moving creation of THD to new threadMonty2016-02-071-2/+0
* | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-295-3/+15
|\ \ \ | |/ /
| * | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-0/+3
| |\ \
| | * \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-193-2/+5
| | |\ \ | | | |/
| | * | Add close-on-exec flag to open(), socket(), accept() & fopen().Nirbhay Choubey2015-06-241-1/+23
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-213-2/+5
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2015-12-132-0/+3
| | |\ \
| | | * | 5.6.28Sergei Golubchik2015-12-132-0/+3
| | * | | Correct comments before mysql_socket_{g|s}etfd to refer to the right functionDaniel Black2015-12-111-2/+2
| | | |/ | | |/|
| * | | document %M formatSergei Golubchik2015-12-191-1/+5
| * | | Fix warning about unused variable if FD_CLOEXEC is not definedVladislav Vaintroub2015-11-241-0/+2
* | | | MDEV-8111 - remove "fast mutexes"Sergey Vojtovich2015-11-261-16/+0
* | | | cmake: remove unused checks, options, and symbolsSergei Golubchik2015-11-231-1/+1
|/ / /
* | | MDEV-8973 Build failure on missing alloca.hSergei Golubchik2015-11-161-0/+2
* | | compilation failure on windowsSergei Golubchik2015-10-051-0/+2
* | | update encryption plugin and service versionsSergei Golubchik2015-09-041-1/+1
* | | document new encryption plugin apiSergei Golubchik2015-09-042-4/+38
* | | New encryption API. Piece-wise encryption.Sergei Golubchik2015-09-047-85/+270
* | | compilation failures on WindowsSergei Golubchik2015-07-231-0/+4
* | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-07-142-2/+36
* | | cleanup: safer versions of PSI no-op macrosSergei Golubchik2015-06-271-6/+6
* | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-278-104/+0
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-116-52/+0
| |\ \
| | * | MDEV-8052 abi detection incorrect with clangSergei Golubchik2015-06-036-40/+0
* | | | MDEV-7956 - handler::rebind_psi() takes 0.07% in OLTP ROSergey Vojtovich2015-06-191-0/+6
* | | | just like tempfiles: use key id 2 for temp Aria tablesSergei Golubchik2015-06-021-0/+3
* | | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-015-79/+32
|\ \ \ \ | |/ / /
| * | | perfschema 5.6.24Sergei Golubchik2015-05-055-79/+32
| |\ \ \ | | | |/ | | |/|
| | * | 5.6.24Sergei Golubchik2015-05-045-79/+32
* | | | Identical key derivation code in XtraDB/InnoDB/AriaSergei Golubchik2015-05-158-1/+320
* | | | Add encryption key id to the API as a distinct conceptSergei Golubchik2015-04-097-44/+58
* | | | renames to follow single consistent naming styleSergei Golubchik2015-04-098-112/+119
* | | | remove wrappers in encryption_keys.ccSergei Golubchik2015-04-096-90/+26
* | | | encryption plugin controls the encryptionSergei Golubchik2015-04-097-6/+114
* | | | rename "encryption key management plugin" to "encryption plugin"Sergei Golubchik2015-04-094-9/+9
* | | | optimize encryption apiSergei Golubchik2015-04-087-39/+34
* | | | copy-paste bug in service_sha1.hSergei Golubchik2015-04-081-4/+4
* | | | small cleanupSergei Golubchik2015-04-081-1/+1