summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* A clean-up after the patch for MDEV-8747 and MDEV-8749:Alexander Barkov2015-09-062-2/+2
* update encryption plugin and service versionsSergei Golubchik2015-09-042-2/+2
* document new encryption plugin apiSergei Golubchik2015-09-042-4/+38
* MDEV-6066: Merge new defaults from 5.6 and 5.7Sergei Golubchik2015-09-041-3/+3
* MDEV-6066: Merge new defaults from 5.6 and 5.7 (autoset)Oleksandr Byelkin2015-09-041-1/+3
* cleanup: my_checksumSergei Golubchik2015-09-041-1/+0
* New encryption API. Piece-wise encryption.Sergei Golubchik2015-09-048-128/+309
* simplify and unify my_safe_alloca usageSergei Golubchik2015-09-041-7/+8
* Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-0/+1
|\
| * Fixed overrun in key cache if one tried to allocate a key cacheMonty2015-08-131-0/+1
* | MDEV-6152: Remove calls to current_thd while creating ItemMonty2015-09-013-10/+7
* | MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a'Alexander Barkov2015-08-281-0/+4
* | MDEV-6152: Remove calls to current_thd while creating ItemMonty2015-08-271-0/+7
* | UNINIT_VAR() fixesSergey Vojtovich2015-08-251-1/+1
* | Merge /my/maria-10.1-default into 10.1Monty2015-08-181-1/+1
|\ \
| * | Fixed failing tests and compiler warningsMonty2015-08-181-1/+1
* | | Adding MY_CHARSET_HANDLER::native_to_mb().Alexander Barkov2015-08-141-0/+15
|/ /
* | compilation failures on WindowsSergei Golubchik2015-07-231-0/+4
* | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-07-143-2/+42
* | MDEV-8215 Asian MB3 charsets: compare broken bytes as "greater than any non-b...Alexander Barkov2015-07-031-1/+0
* | cleanup: safer versions of PSI no-op macrosSergei Golubchik2015-06-271-6/+6
* | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-2711-115/+3
|\ \ | |/
| * MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4Sergei Golubchik2015-06-162-4/+3
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-06-117-59/+0
| |\
| | * MDEV-8052 abi detection incorrect with clangSergei Golubchik2015-06-037-47/+0
* | | MDEV-7956 - handler::rebind_psi() takes 0.07% in OLTP ROSergey Vojtovich2015-06-191-0/+6
* | | my_aes_encrypt_gcm() and my_aes_decrypt_gcm()Sergei Golubchik2015-06-021-0/+13
* | | my_aes_get_size()Sergei Golubchik2015-06-021-1/+1
* | | just like tempfiles: use key id 2 for temp Aria tablesSergei Golubchik2015-06-021-0/+3
* | | MDEV-8126 encryption for temp filesSergei Golubchik2015-06-021-1/+1
* | | always use my_b_pread() instead of mysql_file_pread()Sergei Golubchik2015-06-021-0/+1
* | | my_b_fill, inline my_b_* functions instead of hairy macrosSergei Golubchik2015-06-022-45/+97
* | | misc IO_CACHE cleanupsSergei Golubchik2015-06-021-15/+7
* | | cleanup: LOAD DATA replication support in IO_CACHESergei Golubchik2015-06-021-12/+0
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-017-80/+34
|\ \ \ | |/ /
| * | perfschema 5.6.24Sergei Golubchik2015-05-055-79/+32
| |\ \
| | * | 5.6.24Sergei Golubchik2015-05-045-79/+32
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | MDEV-6916 REPAIR VIEW / mysql migrationOleksandr Byelkin2015-04-121-0/+1
| * | | SSL: Verbosely report SSL initialization errorsSergei Golubchik2015-05-031-1/+1
* | | | MDEV-8241: Debug build on Windows is broken: error LNK2019: unresolved extern...Oleksandr Byelkin2015-05-291-1/+1
* | | | MDEV-7067: Server outputs Galera (WSREP) information, even if Galera is disabledNirbhay Choubey2015-05-291-0/+4
* | | | Identical key derivation code in XtraDB/InnoDB/AriaSergei Golubchik2015-05-1510-5/+325
* | | | move AES_CTR to its own greatly simplified functionSergei Golubchik2015-05-131-7/+2
* | | | Add encryption key id to the API as a distinct conceptSergei Golubchik2015-04-097-44/+58
* | | | remove now-empty my_aes.{h,cc}Sergei Golubchik2015-04-092-71/+33
* | | | renames to follow single consistent naming styleSergei Golubchik2015-04-099-113/+120
* | | | remove wrappers in encryption_keys.ccSergei Golubchik2015-04-096-90/+26
* | | | encryption plugin controls the encryptionSergei Golubchik2015-04-099-122/+150
* | | | rename "encryption key management plugin" to "encryption plugin"Sergei Golubchik2015-04-094-9/+9