Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-9618 solaris sparc build fails on 10.1. | Alexey Botchkov | 2016-05-04 | 5 | -0/+42 |
* | Fixed wrong counting of global Memory_used | Monty | 2016-04-28 | 6 | -6/+13 |
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -1/+1 |
|\ | |||||
| * | Update AskMonty and Atlassian references to MariaDB | iangilfillan | 2016-03-08 | 1 | -1/+1 |
* | | Fix to ensure updates in gtid_slave_state table do not get binlogged. | Nirbhay Choubey | 2016-02-24 | 1 | -3/+3 |
* | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-12-22 | 1 | -0/+3 |
|\ \ | |||||
| * \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 3 | -2/+5 |
| |\ \ | | |/ | |||||
| * | | Add close-on-exec flag to open(), socket(), accept() & fopen(). | Nirbhay Choubey | 2015-06-24 | 1 | -1/+23 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 3 | -2/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 2 | -0/+3 |
| |\ \ | |||||
| | * | | 5.6.28 | Sergei Golubchik | 2015-12-13 | 2 | -0/+3 |
| * | | | Correct comments before mysql_socket_{g|s}etfd to refer to the right function | Daniel Black | 2015-12-11 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | document %M format | Sergei Golubchik | 2015-12-19 | 1 | -1/+5 |
* | | | Fix warning about unused variable if FD_CLOEXEC is not defined | Vladislav Vaintroub | 2015-11-24 | 1 | -0/+2 |
* | | | MDEV-8973 Build failure on missing alloca.h | Sergei Golubchik | 2015-11-16 | 1 | -0/+2 |
* | | | compilation failure on windows | Sergei Golubchik | 2015-10-05 | 1 | -0/+2 |
* | | | update encryption plugin and service versions | Sergei Golubchik | 2015-09-04 | 1 | -1/+1 |
* | | | document new encryption plugin api | Sergei Golubchik | 2015-09-04 | 2 | -4/+38 |
* | | | New encryption API. Piece-wise encryption. | Sergei Golubchik | 2015-09-04 | 7 | -85/+270 |
* | | | compilation failures on Windows | Sergei Golubchik | 2015-07-23 | 1 | -0/+4 |
* | | | Merge branch '10.0-galera' into 10.1 | Nirbhay Choubey | 2015-07-14 | 2 | -2/+36 |
* | | | cleanup: safer versions of PSI no-op macros | Sergei Golubchik | 2015-06-27 | 1 | -6/+6 |
* | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 8 | -104/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 6 | -52/+0 |
| |\ \ | |||||
| | * | | MDEV-8052 abi detection incorrect with clang | Sergei Golubchik | 2015-06-03 | 6 | -40/+0 |
* | | | | MDEV-7956 - handler::rebind_psi() takes 0.07% in OLTP RO | Sergey Vojtovich | 2015-06-19 | 1 | -0/+6 |
* | | | | just like tempfiles: use key id 2 for temp Aria tables | Sergei Golubchik | 2015-06-02 | 1 | -0/+3 |
* | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 5 | -79/+32 |
|\ \ \ \ | |/ / / | |||||
| * | | | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 5 | -79/+32 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | 5.6.24 | Sergei Golubchik | 2015-05-04 | 5 | -79/+32 |
* | | | | Identical key derivation code in XtraDB/InnoDB/Aria | Sergei Golubchik | 2015-05-15 | 8 | -1/+320 |
* | | | | Add encryption key id to the API as a distinct concept | Sergei Golubchik | 2015-04-09 | 7 | -44/+58 |
* | | | | renames to follow single consistent naming style | Sergei Golubchik | 2015-04-09 | 8 | -112/+119 |
* | | | | remove wrappers in encryption_keys.cc | Sergei Golubchik | 2015-04-09 | 6 | -90/+26 |
* | | | | encryption plugin controls the encryption | Sergei Golubchik | 2015-04-09 | 7 | -6/+114 |
* | | | | rename "encryption key management plugin" to "encryption plugin" | Sergei Golubchik | 2015-04-09 | 4 | -9/+9 |
* | | | | optimize encryption api | Sergei Golubchik | 2015-04-08 | 7 | -39/+34 |
* | | | | copy-paste bug in service_sha1.h | Sergei Golubchik | 2015-04-08 | 1 | -4/+4 |
* | | | | small cleanup | Sergei Golubchik | 2015-04-08 | 1 | -1/+1 |
* | | | | remove get_iv() from the key management plugin API | Sergei Golubchik | 2015-04-08 | 7 | -23/+0 |
* | | | | encryption cleanup: delete obsolete files | Sergei Golubchik | 2015-04-05 | 1 | -60/+0 |
* | | | | MDEV-6819 st_mysql_show_var::value should be void* not char* | Sergei Golubchik | 2015-03-07 | 6 | -12/+12 |
* | | | | MDEV-7572: InnoDB: Assertion failure in log_init_crypt_key if | Jan Lindström | 2015-02-26 | 1 | -1/+1 |
* | | | | encryption keys service | Sergei Golubchik | 2015-02-10 | 8 | -0/+186 |
* | | | | encryption key management plugin api | Sergei Golubchik | 2015-02-10 | 3 | -2/+439 |
* | | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -1/+2 |
* | | | | password validation plugin API: renames | Sergei Golubchik | 2015-02-10 | 2 | -4/+4 |
* | | | | Improve performance for calculating memory allocation | Monty | 2015-02-01 | 5 | -5/+26 |
* | | | | remove wsrep_hton dependency from innodb/xtradb | Sergei Golubchik | 2015-01-08 | 1 | -3/+3 |
* | | | | MDEV-6712 THD specifics for plugins | Sergei Golubchik | 2014-12-04 | 6 | -0/+159 |