summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-1/+1
|\
| * Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-1/+1
| |\
| | * Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-1/+1
| | |\
| | | * Fixing wrong copyright. Index.xml was modified in 2005,Alexander Barkov2012-07-241-1/+1
* | | | Fixed that 'make distcheck' works with automake 1.11.11Michael Widenius2012-02-211-0/+1
* | | | Merge with 5.2.Michael Widenius2011-12-113-6/+6
|\ \ \ \ | |/ / /
| * | | Merge with MariaDB 5.1Michael Widenius2011-11-243-6/+6
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.60Michael Widenius2011-11-231-2/+2
| | |\ \ | | | |/
| | | * BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED Raghav Kapoor2011-09-281-2/+2
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-212-4/+4
| | |\ \ | | | |/
| | | * Updated/added copyright headersKent Boortz2011-06-302-4/+4
| | | |\
* | | | | test results updated.Alexey Botchkov2011-11-171-3/+2
* | | | | merging.Alexey Botchkov2011-11-121-0/+8
|\ \ \ \ \
| * | | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys...Michael Widenius2011-10-261-0/+4
| * | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-0/+2
| * | | | | Fix for LP BUG#806071unknown2011-07-211-0/+2
* | | | | | gis-related tests fixes.Alexey Botchkov2011-06-201-8/+46
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | MergeKent Boortz2010-12-291-0/+16
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | | * | | | | - Added/updated copyright headersKent Boortz2010-12-281-0/+16
| | | * | | | | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8Alexander Barkov2010-11-261-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
* | | | | restore shifted error numbersSergei Golubchik2010-09-121-8/+7
* | | | | Fixed bug #604549.Igor Babaev2010-07-131-8/+11
| |_|_|/ |/| | |
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-1/+1
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-1/+1
| |\ \ \