summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* A preparatory patch for MDEV-6566.Alexander Barkov2015-03-021-0/+42
* MDEV-7572: InnoDB: Assertion failure in log_init_crypt_key ifJan Lindström2015-02-262-3/+3
* Don't link plugins with libmysys.a or libmysys_ssl.aSergei Golubchik2015-02-151-2/+2
* cmake-time detection for EVP_aes_128_ctr()Sergei Golubchik2015-02-101-2/+0
* encryption keys serviceSergei Golubchik2015-02-1010-34/+187
* encryption key management plugin apiSergei Golubchik2015-02-104-56/+447
* Push for testing of encryptionMonty2015-02-108-28/+300
* --getopt-prefix-matching command-line optionSergei Golubchik2015-02-101-0/+1
* password validation plugin API: renamesSergei Golubchik2015-02-102-4/+4
* Improve performance for calculating memory allocationMonty2015-02-015-5/+26
* Merge branch '10.0' into merge-wipSergei Golubchik2015-01-315-10/+23
|\
| * 5.5 mergeSergei Golubchik2015-01-214-7/+21
| |\
| | * MDEV-6671 mysql_server_end breaks OpenSSLSergei Golubchik2015-01-192-0/+2
| | * mysql-5.5.41 mergeSergei Golubchik2014-12-191-4/+14
| | |\
| | | * Bug #18808072 MYSQLBINLOG USES LOCALTIME() TO PRINT EVENTS, CAUSES KERNEL MUT...Venkatesh Duggirala2014-10-081-3/+13
| | * | MDEV-6871 Multi-value insert on MyISAM table that makes slaves crash (when us...Michael Widenius2014-12-151-1/+3
| | * | MDEV-6891: Addendum, update company name in copyright noticeNirbhay Choubey2014-12-121-1/+1
| | * | MDEV-6939 : Dots in file names of configuration filesNirbhay Choubey2014-10-291-0/+1
| | * | jemalloc compatibilitySergei Golubchik2014-10-081-0/+1
| * | | rename st_my_thread_var::opt_info -> st_my_thread_var::keycache_linkSergei Golubchik2015-01-191-1/+1
| * | | remove unused st_my_thread_var::cmp_lengthSergei Golubchik2015-01-191-1/+0
| * | | MDEV-6891: Addendum, update company name in copyright noticeNirbhay Choubey2014-12-121-1/+1
* | | | fix a duplicate macro definitionSergei Golubchik2015-01-151-1/+0
* | | | MDEV-7437 remove suport for "atomics" with rwlocksSergei Golubchik2015-01-134-193/+17
* | | | remove wsrep_hton dependency from innodb/xtradbSergei Golubchik2015-01-082-4/+4
* | | | MDEV-7324 - Lock-free hash for table definition cacheSergey Vojtovich2014-12-281-0/+3
* | | | lf_hash_iterate() functionSergei Golubchik2014-12-281-0/+2
* | | | Cherry pick dynamic array changes from commit:Sergey Vojtovich2014-12-051-0/+5
* | | | MDEV-7004 - Merge scalability fixes from 10.0-powerSergey Vojtovich2014-12-051-1/+2
* | | | MDEV-6712 THD specifics for pluginsSergei Golubchik2014-12-047-0/+161
* | | | password validation plugin type and a simple pluginSergei Golubchik2014-12-043-8/+400
* | | | remove unsupported service fileSergei Golubchik2014-12-041-64/+0
* | | | cleanup: s/const CHARSET_INFO/CHARSET_INFO/Sergei Golubchik2014-12-041-2/+2
* | | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-022-10/+0
|\ \ \ \ | |/ / /
| * | | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-302-10/+0
* | | | Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1Sergei Golubchik2014-10-169-49/+80
|\ \ \ \
| * \ \ \ Merge 10.0.14 into 10.1Sergei Golubchik2014-10-159-49/+80
| |\ \ \ \ | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2014-09-161-0/+6
| | |\ \ \ | | | |/ /
| | | * | 5.3 mergeSergei Golubchik2014-09-121-0/+6
| | | |\ \
| | | | * \ Merge.Igor Babaev2014-08-041-0/+6
| | | | |\ \
| | | | | * | Fixed bug mdev-5721.Igor Babaev2014-07-311-0/+6
| | * | | | | compilation fixes for WITH_ATOMIC_OPS=rwlocksSergei Golubchik2014-09-081-38/+0
| | * | | | | - MDEV-6695 Bad column name for UCS2 string literalsAlexander Barkov2014-09-041-0/+8
| | * | | | | Automatic merge from 5.5Michael Widenius2014-08-191-0/+44
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | MDEV-6450 - MariaDB crash on Power8 when built with advance tool chainMichael Widenius2014-08-191-0/+44
| | * | | | | MDEV-6274 Collation usage statisticsAlexander Barkov2014-08-111-0/+5
| | * | | | | 5.5.39 mergeSergei Golubchik2014-08-071-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | mysql-5.5.39 mergeSergei Golubchik2014-08-021-1/+3
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS,Venkatesh Duggirala2014-05-081-1/+3
| | * | | | | Fixed problem with very slow shutdown when using 100,000 MyISAM tables with d...Michael Widenius2014-07-191-4/+9