summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* after merge changes:Sergei Golubchik2011-12-121-175/+175
* 5.3->5.5 mergeSergei Golubchik2011-11-221-0/+4
|\
| * 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
* | mysql-5.5.18 mergeSergei Golubchik2011-11-033-96/+169
|\ \
| * | Update the German error message translations (by Stefan Hinz)Marko Mäkelä2011-09-291-83/+125
| * | Bug#11747416 : 32228 A disk full makes binary log corruptAndrei Elkin2011-09-291-8/+8
| * | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE...Rohit Kalhans2011-09-291-0/+18
| * | Merge of fix for bug#11758062 from mysql-5.1.Raghav Kapoor2011-09-281-2/+2
| |\ \
| | * | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED Raghav Kapoor2011-09-281-2/+2
| * | | merge from 5.5.16Daniel Fischer2011-09-211-0/+6
| |\ \ \
| | * | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-0/+5
| * | | | Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZEMarko Mäkelä2011-09-011-0/+3
| * | | | Fix bug #11830883, SUPPORT "CORRUPTED" BIT FOR INNODB TABLES AND INDEXES.Jimmy Yang2011-08-161-0/+2
| |/ / /
| * | | Updated/added copyright headersKent Boortz2011-06-302-3/+4
| |\ \ \ | | |/ /
| | * | Updated/added copyright headersKent Boortz2011-06-302-4/+4
| | |\ \
* | | \ \ 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