summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* MDEV-6891: Addendum, update company name in copyright noticeNirbhay Choubey2014-12-121-1/+1
* bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-052-10/+0
|\
| * MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-302-10/+0
* | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-285-38/+63
|\ \ | |/
| * 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
* | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-114-11/+17
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | Local merge of patch for MDEV-3896 from maria-5.5-galera.Nirbhay Choubey2014-07-211-0/+3
* | | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-193-4/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-2110-22/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
| | | * | | | | Fixing the bug 18184414: WRONG COPYRIGHT TO FILE INCLUDE/MYSQL_VERSION.H.INMurthy Narkedimilli2014-02-061-3/+4
| | | * | | | | Bug #17760379 COLLATIONS WITH CONTRACTIONS BUFFER-OVERFLOW THEMSELVES IN THE ...Venkata Sidagam2014-01-111-2/+2
| | | * | | | | updating the current copyright year which reflects in the MySQL welcome message.Murthy Narkedimilli2014-01-091-2/+2
| * | | | | | | merge of "BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM"Sergei Golubchik2014-05-072-2/+4
| * | | | | | | perfschema 5.6.17Sergei Golubchik2014-05-075-6/+6
| |\ \ \ \ \ \ \
| | * | | | | | | 5.6.17Sergei Golubchik2014-05-076-8/+8
| * | | | | | | | null-merge from perfschema-5.6 merge treeSergei Golubchik2014-05-072-11/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | perfschema 5.6.10 initial commit.Sergei Golubchik2014-05-0714-0/+7835
| | / / / / / /
* | | | | | | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-0810-13/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Revert revision sergii@pisem.net-20130123151853-xc6i3l11aqv0iykkSergei Golubchik2014-03-261-2/+3
| * | | | | | | 5.5 mergeSergei Golubchik2014-03-261-8/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | MDEV-5905: Creating tmp. memory table kills the serverMichael Widenius2014-03-261-8/+8
| | * | | | | | MDEV-5822 TokuDB fails to compile without partition storage engineSergei Golubchik2014-03-241-0/+6
| * | | | | | | MDEV-5404 Can't free data returned by mariadb_dyncol_unpack on windowsSergei Golubchik2014-03-191-0/+3
| * | | | | | | MDEV-5914: Parallel replication deadlock due to InnoDB lock conflictsunknown2014-03-214-0/+4
View Lorry Controller Status