summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| / /
* | | 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
* | | Merge with 10.0-baseMichael Widenius2014-03-131-0/+10
|\ \ \
* | | | Fixed some failing testsMichael Widenius2014-03-121-1/+1
* | | | MDEV-5766 - my_atomic_load does memory writesSergey Vojtovich2014-03-071-0/+6
* | | | Fixed MDEV-5780 "create-big fails in 10.0"Michael Widenius2014-03-101-2/+2
* | | | MDEV-5372 Make "CAST(time_expr AS DATETIME)" compatible with MySQL-5.6 (and t...Alexander Barkov2014-03-071-0/+3
* | | | MDEV-5675 - Performance: my_hash_sort_bin is called too oftenSergey Vojtovich2014-03-061-2/+7
* | | | mergeSergei Golubchik2014-02-2810-28/+16
|\ \ \ \
| * \ \ \ 10.0-base mergeSergei Golubchik2014-02-2610-27/+16
| |\ \ \ \ | | |/ / /
| | * | | 5.5 mergeSergei Golubchik2014-02-2510-25/+14
| | |\ \ \ | | | |/ /
| | | * | MDEV-5613 m_string.h exports generic function names without a namespace prefi...Sergei Golubchik2014-02-171-5/+1
| | | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-179-20/+13
| | | |\ \
| | | | * | Updating the current copyright year in the welcome message for MySQL.Murthy Narkedimilli2014-01-081-2/+2
| | | | |/
| | | | * Updated/added copyright headersMurthy Narkedimilli2014-01-065-5/+5
| | | | * Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAITChristopher Powers2013-11-071-2/+2
| | | | * Bug#17702677 WRONG INSTRUMENTATION INTERFACE FOR MYSQL_COND_TIMEDWAITMarc Alff2013-11-061-2/+2
* | | | | Fixing AIX compilation failiresAlexander Barkov2014-02-271-0/+33
|/ / / /
* | | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-194-11/+11
* | | | Merge MariaDB 10.0-base to 10.0.unknown2014-02-101-0/+1
|\ \ \ \ | |/ / /
| * | | Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-101-0/+1
| |\ \ \
| | * | | MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-071-0/+1
* | | | | Automatic mergeMichael Widenius2014-02-051-3/+8
|\ \ \ \ \
| * | | | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-3/+8
* | | | | | mergeSergei Golubchik2014-02-046-54/+83
|\ \ \ \ \ \
| * \ \ \ \ \ 10.0-base mergeSergei Golubchik2014-02-036-46/+82
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | 5.5 mergeSergei Golubchik2014-02-016-49/+85
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | MySQL-5.5.35 mergeSergei Golubchik2014-01-223-41/+74
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Bug#17513737 INTRODUCE CHECK TABLE...QUICKAnil Toshniwal2013-10-172-46/+70
| | | | * | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-022-1/+9
| | | * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-222-1/+3
| * | | | | MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-5/+0
| * | | | | MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-011-3/+1
| | |_|_|/ | |/| | |
* | | | | Removing "#include <sys/timeb.h>" from my_global.h,Alexander Barkov2014-02-041-3/+0
|/ / / /
* | | | remove a deprecated API function from the plugin.hSergei Golubchik2013-12-224-15/+0
View Lorry Controller Status