Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -1/+0 | |
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | ||||||
| | | | * | | | | MDEV-12230 include/my_sys.h:600:43: error: unknown type name âPSI_file_keyâ... | Sergei Golubchik | 2017-04-20 | 1 | -0/+47 | |
| * | | | | | | | Merge 10.1 into 10.2 | Marko MÀkelÀ | 2017-05-06 | 9 | -1/+372 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | MDEV-11663 Create services for functionality used by plugins | Vladislav Vaintroub | 2017-04-27 | 9 | -1/+372 | |
* | | | | | | | | Fixed compiler warnings and warnings from build.tags | Monty | 2017-05-08 | 1 | -1/+1 | |
* | | | | | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 9 | -36/+103 | |
|/ / / / / / / | ||||||
* | | | | | | | Fix the build on Windows. | Vladislav Vaintroub | 2017-04-02 | 1 | -0/+17 | |
* | | | | | | | move rocksdb specific changes into rocksdb | Sergei Golubchik | 2017-03-31 | 1 | -17/+0 | |
* | | | | | | | Merge 10.2 into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-31 | 16 | -929/+1577 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | 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 | |
* | | | | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-11 | 4 | -12/+12 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Fix many -Wconversion warnings. | Marko MÀkelÀ | 2017-03-07 | 4 | -12/+12 | |
* | | | | | | MDEV-11901 : MariaRocks on Windows | Vladislav Vaintroub | 2017-02-01 | 1 | -0/+17 | |
|/ / / / / | ||||||
* | | | | | 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 |