summaryrefslogtreecommitdiff
path: root/include/mysql
Commit message (Expand)AuthorAgeFilesLines
* Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-046-60/+60
|\
| * Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-026-75/+75
| |\
| | * MDEV-13384 Fix Windows warnings. thd_alloc functions now use size_t parametersVladislav Vaintroub2017-09-286-75/+75
* | | Fix compilation warnings in pluginsSergei Golubchik2017-08-246-39/+21
* | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-2/+0
|/ /
* | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-2610-2/+372
|\ \ | |/
| * Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-1/+0
| |\
| | * Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-1/+0
| | |\
| | | * Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-1/+0
| | | |\
| | | | * MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ...Sergei Golubchik2017-04-201-0/+47
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-069-1/+372
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11663 Create services for functionality used by pluginsVladislav Vaintroub2017-04-279-1/+372
* | | | | Fixed compiler warnings and warnings from build.tagsMonty2017-05-081-1/+1
* | | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-239-36/+103
|/ / / /
* | | | Fix the build on Windows.Vladislav Vaintroub2017-04-021-0/+17
* | | | move rocksdb specific changes into rocksdbSergei Golubchik2017-03-311-17/+0
* | | | Merge 10.2 into bb-10.2-mariarocksSergei Petrunia2017-03-3116-929/+1577
|\ \ \ \
| * \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2017-03-3016-929/+1577
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-211-0/+44
| | |\ \ \ | | | |/ /
| | | * | compiler warningSergei Golubchik2017-03-161-2/+2
| | | * | MDEV-12261 build failure without P_SSergei Golubchik2017-03-151-0/+44
| | * | | Correct FSF addressiangilfillan2017-03-103-3/+3
| | * | | small plugin API related fixesSergei Golubchik2017-03-101-2/+2
| | * | | cleanup: sort various lists of servicesSergei Golubchik2017-03-106-1097/+1097
| | * | | thd_rnd serviceSergei Golubchik2017-03-107-0/+93
| | * | | Auth Plugin API: add THD to MYSQL_SERVER_AUTH_INFOSergei Golubchik2017-03-102-1/+7
| | * | | base64 serviceSergei Golubchik2017-03-107-0/+163
| | * | | my_sha2 serviceSergei Golubchik2017-03-108-3/+384
| | * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-092-40/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-032-40/+1
| | | |\ \ | | | | |/
| | | | * bugfix: remove my_delete_with_symlink()Sergei Golubchik2017-02-271-41/+0
* | | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-03-114-12/+12
|\ \ \ \ \ | |/ / / /
| * | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-074-12/+12
* | | | | MDEV-11901 : MariaRocks on WindowsVladislav Vaintroub2017-02-011-0/+17
|/ / / /
* | | | 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
| | |\ \ \ | | | |/ /