summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-103-3/+13
|\
| * 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
* | | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-164-11/+19
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| * | | | | | 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
* | | | | | | Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-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
* | | | | | | * Merged the missing revision 3934 fromNirbhay Choubey2014-02-051-1/+1
* | | | | | | Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-296-43/+78
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| * | | | | | Fixed compiler errors and warningsMichael Widenius2013-12-021-1/+1
* | | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-252-0/+81
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Added usage of handler error names to mysqltestMichael Widenius2013-11-052-0/+81
* | | | | | | mariadb-5.5.33 mergeSergei Golubchik2013-09-1811-5/+209
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax error...Sergei Golubchik2013-09-091-1/+1
| * | | | | | MDEV-4472 Audit-plugin. Server-related part of the task.Alexey Botchkov2013-09-098-1/+185
| * | | | | | mysql-5.5.33 mergeSergei Golubchik2013-09-063-3/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8Tor Didriksen2013-06-141-2/+2
| | * | | | | Bug#16194302: SUPPORT FOR FLOATING-POINT SYSTEM VARIABLESAshish Agarwal2013-05-192-0/+14
| * | | | | | MDEV-4165 [PATCH] RFE: make tmpdir a build-time configurable optionSergei Golubchik2013-08-171-0/+7
* | | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-2120-37/+50
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mysql-5.5.32 mergeSergei Golubchik2013-07-1613-13/+13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1914-14/+14
| * | | | | | Merging from 5.3Alexander Barkov2013-07-081-6/+9
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | MDEV-4667 DATE('string') incompability between mysql and mariadbSergei Golubchik2013-07-031-6/+9
| * | | | | | MDEV-4720 : fix my_context.h for use with x32 ABI.Vladislav Vaintroub2013-06-271-1/+1
| * | | | | | MDEV-4576 : Aria storage engine's temporary files might not be deleted (Errc...Vladislav Vaintroub2013-06-161-7/+0
| * | | | | | MDEV-4601 : Allow MariaDB to be build without non-blocking client.Vladislav Vaintroub2013-06-151-1/+10
| * | | | | | MDEV-4519 SHOW EVENTS and SHOW PROCEDURE STATUS truncate long user namesSergei Golubchik2013-06-131-0/+2
| * | | | | | MDEV-4573 UNINSTALL PLUGIN misleading error message for non-dynamic pluginsSergei Golubchik2013-06-131-0/+1