Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 16 | -929/+1577 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-03-21 | 1 | -0/+44 |
| |\ | |||||
| | * | compiler warning | Sergei Golubchik | 2017-03-16 | 1 | -2/+2 |
| | * | MDEV-12261 build failure without P_S | Sergei Golubchik | 2017-03-15 | 1 | -0/+44 |
| * | | Correct FSF address | iangilfillan | 2017-03-10 | 3 | -3/+3 |
| * | | small plugin API related fixes | Sergei Golubchik | 2017-03-10 | 1 | -2/+2 |
| * | | cleanup: sort various lists of services | Sergei Golubchik | 2017-03-10 | 6 | -1097/+1097 |
| * | | thd_rnd service | Sergei Golubchik | 2017-03-10 | 7 | -0/+93 |
| * | | Auth Plugin API: add THD to MYSQL_SERVER_AUTH_INFO | Sergei Golubchik | 2017-03-10 | 2 | -1/+7 |
| * | | base64 service | Sergei Golubchik | 2017-03-10 | 7 | -0/+163 |
| * | | my_sha2 service | Sergei Golubchik | 2017-03-10 | 8 | -3/+384 |
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 2 | -40/+1 |
| |\ \ | | |/ | |||||
| | * | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 2 | -40/+1 |
| | |\ | |||||
| | | * | bugfix: remove my_delete_with_symlink() | Sergei Golubchik | 2017-02-27 | 1 | -41/+0 |
* | | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 4 | -12/+12 |
* | | | | Merge InnoDB 5.7 from mysql-5.7.9. | Jan Lindström | 2016-09-02 | 2 | -0/+302 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 5 | -0/+42 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-9618 solaris sparc build fails on 10.1. | Alexey Botchkov | 2016-05-04 | 5 | -0/+42 |
* | | | | Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2 | Monty | 2016-04-28 | 6 | -6/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed wrong counting of global Memory_used | Monty | 2016-04-28 | 6 | -6/+13 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 |
* | | | | MDEV-9651 - Simplify audit event dispatching | Sergey Vojtovich | 2016-03-08 | 2 | -2/+2 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-02-25 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix to ensure updates in gtid_slave_state table do not get binlogged. | Nirbhay Choubey | 2016-02-24 | 1 | -3/+3 |
* | | | | Fix compilation10.2-ssl | Vladislav Vaintroub | 2016-02-10 | 1 | -1/+1 |
* | | | | MDEV-6150 Speed up connection speed by moving creation of THD to new thread | Monty | 2016-02-07 | 1 | -2/+0 |
* | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Alexander Barkov | 2015-12-29 | 5 | -3/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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-8111 - remove "fast mutexes" | Sergey Vojtovich | 2015-11-26 | 1 | -16/+0 |
* | | | | | cmake: remove unused checks, options, and symbols | Sergei Golubchik | 2015-11-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | 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 |
| |\ \ \ | | | |/ | | |/| |