summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | | Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance ...Michael Widenius2014-07-192-6/+7
* | | | | | | MDEV-6693 - Atomic operations with explicit memory barrierSergey Vojtovich2014-10-141-1/+135
|/ / / / / /
* | | | | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-113-8/+0
* | | | | | SHOW and FLUSH for I_S tables.Sergei Golubchik2014-10-111-5/+1
* | | | | | cleanup: move safe_str*() from sql_acl.cc to m_string.hSergei Golubchik2014-10-102-3/+15
* | | | | | Plugin API: increase SHOW_VAR_FUNC_BUFF_SIZE for 64-bit CPUsSergei Golubchik2014-10-101-2/+2
* | | | | | cleanup: simplify the usage of WSREP_FORMAT macroSergei Golubchik2014-10-101-9/+0
* | | | | | followup changes to timeout commitSergei Golubchik2014-10-101-4/+4
* | | | | | MDEV 4427: query timeoutsMonty2014-10-071-0/+45
* | | | | | fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-013-0/+207
* | | | | | use MD5 service in innodb/xtradbSergei Golubchik2014-10-011-1/+1
* | | | | | MD5 serviceSergei Golubchik2014-10-018-2/+118
* | | | | | extend SHA1 service. cleanup of sha1 wrappersSergei Golubchik2014-10-015-2/+38
* | | | | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-1/+3
* | | | | | compiler warningsSergei Golubchik2014-10-011-1/+1
* | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-274-2/+74
|\ \ \ \ \ \
| * | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-264-2/+74
* | | | | | | MDEV-6305 - UNINIT_VAR emits code in non-debug buildsSergey Vojtovich2014-08-261-7/+5
|/ / / / / /
* | | | | | remove a couple of old unused #definesSergei Golubchik2014-07-041-9/+0
|/ / / / /
* | | | | 5.5.38 mergeSergei Golubchik2014-06-062-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge 5.3->5.5Alexander Barkov2014-06-042-1/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | MDEV-4858 Wrong results for a huge unsigned value inserted into a TIME columnAlexander Barkov2014-06-042-1/+9
| | | |/ | | |/|
| | * | 5.2 mergeSergei Golubchik2014-03-1642-69/+69
| | |\ \
| | | * \ 5.1 mergeSergei Golubchik2014-03-1643-71/+71
| | | |\ \
| | | | * \ mysql-5.1.73 mergeSergei Golubchik2014-03-1543-71/+71
| | | | |\ \
| | | | | * | Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1933-33/+33
| * | | | | | mysql-5.5.38 mergeSergei Golubchik2014-06-031-2/+4
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | BUG#18080920: CRASH; MY_REALLOC_STR DEREFERENCES NEGATIVE VALUE Nisha Gopalakrishnan2014-04-241-2/+4
* | | | | | | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron...Sergei Golubchik2014-05-131-1/+1
* | | | | | | 5.5 mergeSergei Golubchik2014-05-092-3/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mysql-5.5.37 selective mergeSergei Golubchik2014-03-272-3/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171-0/+1