summaryrefslogtreecommitdiff
path: root/include/mysql
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2018-07-031-0/+6
|\
| * Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-0/+6
| |\
| | * Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-0/+6
| | |\
| | | * Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-0/+6
| | | |\
| | | | * MDEV-8743: mysqld port/socket - FD_CLOEXEC if no SOCK_CLOEXECDaniel Black2018-04-191-0/+6
| | | | * Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-1/+0
| | | | |\
| | | | * \ Merge branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-201-0/+44
| | | | |\ \
| | | | * \ \ Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-172-40/+1
| | | | |\ \ \
| | | | * \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-1/+1
| | | | |\ \ \ \
* | | | | | | | | mysys: ME_ERROR_LOG_ONLY flagSergei Golubchik2018-06-041-4/+5
|/ / / / / / / /
* | | | | | | | Optimize performance schema likely/unlikelyMichael Widenius2018-05-079-368/+453
* | | | | | | | Misc. typosluz.paz2018-04-052-2/+2
* | | | | | | | MDEV-15505 Fixes to compilation without -DWITH_WSREP:BOOL=ONTeemu Ollakka2018-03-211-4/+4
* | | | | | | | MDEV-15505 New wsrep XID format for backwards compatibilityTeemu Ollakka2018-03-121-4/+2
* | | | | | | | MDEV-15505 Fix wsrep XID seqno byte orderTeemu Ollakka2018-03-121-0/+8
* | | | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-062-6/+6
* | | | | | | | Changed database, tablename and alias to be LEX_CSTRINGMonty2018-01-303-27/+16
* | | | | | | | Merge branch 'github/10.3' into bb-10.3-temporalmariadb-10.3.4Sergei Golubchik2018-01-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Minor spelling fixes in code comments, docs and outputOtto Kekäläinen2018-01-121-1/+1
* | | | | | | | | remove ifdefs around PSI_THREAD_CALLSergei Golubchik2018-01-091-0/+29
|/ / / / / / / /
* | | | | | | | CleanupsMonty2017-12-086-6/+0
* | | | | | | | 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
| | |\ \ \ \ \ | | | |/ / / /