summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 10.0-monty mergeSergei Golubchik2013-07-2147-849/+1487
|\
| * SHA1 serviceSergei Golubchik2013-07-138-13/+89
| * Fix compiler warning - using "const" twice for CHARSET_INFO.Vladislav Vaintroub2013-07-131-2/+2
| * fix merge.test: online alter table support for MERGE tables, reallySergei Golubchik2013-07-111-1/+2
| * MDEV-4058unknown2013-06-271-0/+21
| * Fixed some wrong format strings.Michael Widenius2013-06-281-2/+1
| * Applied all changes from Igor and SanjaMichael Widenius2013-06-152-0/+33
| * Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-1/+1
| * Temporary commit of 10.0-mergeMichael Widenius2013-03-2639-833/+1337
* | 10.0-base mergeSergei Golubchik2013-07-1821-53/+61
|\ \
| * \ 5.5 mergeSergei Golubchik2013-07-1720-36/+43
| |\ \
| | * \ 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
| | * | | | MDEV-4574 Missing connection option MYSQL_ENABLE_CLEARTEXT_PLUGINSergei Golubchik2013-06-112-2/+5
| | * | | | - Added -Wno-uninitialized to avoid warnings in release buildsMichael Widenius2013-06-092-2/+2
| | * | | | Fixed some cache variables that could be set to higher value than what the co...Michael Widenius2013-06-061-4/+0
| * | | | | cleanup: remove LF_REQUIRE_PINS, use compile_time_assert() instead of reimple...Sergei Golubchik2013-06-241-18/+5
| * | | | | Fix to compile without partitioning.Sergei Golubchik2013-06-151-0/+6
* | | | | | MDEV-4547 [PATCH] Make REFRESH_* constants to be 64-bit in 32-bit compilationunknown2013-07-161-29/+29
* | | | | | Merging temporal literalsAlexander Barkov2013-07-101-7/+20
|\ \ \ \ \ \
| * | | | | | Adding support for the SQL-standard temporal literals.Alexander Barkov2013-07-101-7/+20
* | | | | | | Adding support for MySQL-5.6 temporal column types:Alexander Barkov2013-07-103-3/+31
|/ / / / / /
* | | | | | Merge from 10.0-connectAlexander Barkov2013-06-0812-72/+214
|\ \ \ \ \ \
| * | | | | | Fixing the problem with my_bool_t defined two times.Alexander Barkov2013-06-036-5/+7
| * | | | | | Fixing ABI template, to take into account the latest change inAlexander Barkov2013-05-272-2/+2
| * | | | | | Fixing ABI template, to take into account the latest change inAlexander Barkov2013-05-271-1/+1
| * | | | | | - Fix Windows compile errorOlivier Bertrand2013-05-271-1/+1
| * | | | | | Adding the timezone plugin service, to convert betweenAlexander Barkov2013-05-2410-12/+155
* | | | | | | 10.0-base mergeSergei Golubchik2013-06-0622-32/+121
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 5.5 mergeSergei Golubchik2013-06-0622-32/+121
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | MDEV-4553 - Fixes for compilation under NetBSD.Vladislav Vaintroub2013-05-272-1/+7
| | * | | | | Fixed MDEV-4291: Assertion `trid >= info->s->state.create_trid' failure or da...Michael Widenius2013-05-131-10/+10
| | * | | | | centos5 gcc 4.1 asm bugSergei Golubchik2013-05-071-3/+3
| | * | | | | mysql-5.5.31 mergeSergei Golubchik2013-05-0715-16/+25
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Updated/added copyright headersMurthy Narkedimilli2013-02-2615-15/+21
| | | |\ \ \ \
| | | | * | | | Updated/added copyright headers.Murthy Narkedimilli2013-02-2536-38/+36
| | | * | | | | BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO Neeraj Bisht2013-01-141-0/+2
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO Neeraj Bisht2013-01-141-0/+2
| | * | | | | | MDEV-260 auditing table accessesSergei Golubchik2013-04-192-1/+66
| | * | | | | | MDEV-4332 Increase username length from 16 charactersSergei Golubchik2013-04-181-1/+1
| | * | | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-0/+9
* | | | | | | | Merge 10.0-base -> 10.0unknown2013-05-283-11/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Added some fixes that should make MyISAM & Aria REPAIR work with more than 4G...Michael Widenius2013-05-103-11/+15