summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-191-10/+52
|\
| * Fix for LP BUG#806071unknown2011-07-211-0/+2
| * Merge with 5.1-microsecondsMichael Widenius2011-05-281-6/+6
| |\
| | * post review changes 2Sergei Golubchik2011-05-191-2/+2
| | * post-review changes 1Sergei Golubchik2011-05-191-4/+4
| | * wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-4/+4
| * | Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e...Michael Widenius2011-05-211-0/+13
| * | Rewritten patch of percona - switching query cache on and off, removing comme...unknown2011-05-181-0/+4
| * | Merge with 5.3 mainMichael Widenius2011-05-161-0/+2
| |\ \
| | * \ MWL#89 - Automatic merge with 5.3unknown2011-05-101-1/+2
| | |\ \
| | | * \ MWL#89unknown2011-05-021-1/+2
| | | |\ \
| | | | * \ MWL#89unknown2011-03-301-0/+2
| | | | |\ \
| | | | | * \ MWL#89unknown2011-03-011-0/+2
| | | | | |\ \
| | | | | | * \ Merge MWL#89 into 5.3 main.unknown2011-01-111-0/+2
| | | | | | |\ \
| | | | | | | * \ MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-11-051-0/+2
| | | | | | | |\ \
| | | | | | | | * | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-09-301-0/+2
| * | | | | | | | | Merge with main 5.3Michael Widenius2011-05-081-0/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.unknown2011-05-031-0/+4
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-031-0/+4
| * | | | | | | | | Adding support for Dynamic columns (WL#34):Michael Widenius2011-05-081-2/+15
| |/ / / / / / / /
| * | | | | | | | Added ALTER ONLINE TABLE, which will give an error if the change can't be don...Michael Widenius2011-04-281-0/+3
| | |/ / / / / / | |/| | | | | |
| * | | | | | | merge 5.2Vladislav Vaintroub2011-03-101-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
| | | |\ \ \ \ \
| * | | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-292-1/+55
| |/ / / / / / /
| * | | | | | | virtual columns:Sergei Golubchik2010-12-311-2/+4
| | |_|/ / / / | |/| | | | |
| * | | | | | merge with 5.1Michael Widenius2010-11-301-3/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
* | | | | | 5.5-mergeSergei Golubchik2011-07-024-67/+90
|\ \ \ \ \ \
| * \ \ \ \ \ Manual-merge of patch for bug#11753738 from mysql-5.1 tree.Dmitry Shulga2011-06-101-0/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Implement worklog #5743 InnoDB: Lift the limit of index key prefixes. Jimmy Yang2011-05-311-0/+3
| * | | | | | Merged bug #11766769 to 5.5. Georgi Kodinov2011-03-251-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Bug #11755431 (former 47205)Jon Olav Hauglid2011-03-081-0/+5
| * | | | | | BUG#11762751: UPDATE STATEMENT THROWS AN ERROR, BUT STILL Jorgen Loland2011-02-211-0/+3
| * | | | | | Bug #36022 please log more information about "Sort aborted" queriesTor Didriksen2011-02-021-4/+4
| * | | | | | MergeKent Boortz2010-12-291-0/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MergeKent Boortz2010-12-291-0/+16
| | |\ \ \ \ \
| | | * | | | | - Added/updated copyright headersKent Boortz2010-12-281-0/+16
| * | | | | | | merge mysql-5.5-bugteam(local) --> mysql-5.5-bugteamAlfranio Correia2010-12-031-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | BUG#57275 binlog_cache_size affects trx- and stmt-cache and gets twice the ex...Alfranio Correia2010-11-051-0/+2
| * | | | | | | | Merging from mysql-5.1-bugteamAlexander Barkov2010-11-261-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8Alexander Barkov2010-11-261-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-201-60/+0
| | |/ / / / / | |/| | | | |
| * | | | | | BUG#54144: manual merged bzr bundle from bug report.Luis Soares2010-10-081-1/+8
| |\ \ \ \ \ \
| | * | | | | | BUG#54144: ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE is hard codedLuis Soares2010-10-071-1/+8
| * | | | | | | Merge WL#5496 and WL#5341 to 5.5-bugteam.Sergey Vojtovich2010-10-071-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | WL#5341 - Sticky pluginsSergey Vojtovich2010-09-271-0/+2
| * | | | | | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-061-0/+3
| | |/ / / / / / | |/| | | | | |
| * | | | | | | mergeGeorgi Kodinov2010-10-041-0/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#50036: Inconsistent errors when using TIMESTAMP columns/expressionsMattias Jonsson2010-08-301-0/+4
| | |/ / / / / /