summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
* | | \ 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
| |\ \ \
| | * | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-03-091-4/+4
| | * | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-02-121-4/+4
| | |/ /
| | * | Bug#47974 'TYPE=storage_engine' is deprecated and will be Magne Mahre2010-02-091-1/+1
* | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-0/+5
* | | | mergedSergei Golubchik2010-03-151-6/+6
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-6/+6
| |\ \ \ | | |/ /
| | * | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-4/+4
| | * | AutomergeAlexey Kopytov2009-12-131-2/+2
| | |\ \
| | | * | Bug #42849: innodb crash with varying time_zone on partitioned Alexey Kopytov2009-12-131-2/+2
* | | | | Merge with 5.1Michael Widenius2010-01-041-41/+41
|\ \ \ \ \ | |/ / / /
| * | | | Changed -1 row number in some warnings to 0Michael Widenius2009-12-061-39/+39
| * | | | Fixed Bug#47017 rpl_timezone fails on PB-2 with mismatch errorMichael Widenius2009-12-041-2/+2
* | | | | merge 5.1-> 5.2unknown2009-12-081-1/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-1/+8
| |\ \ \ \ | | |/ / /
| | * | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+7
| | * | | Bug #42914 Log event that larger than max_allowed_packet results in stop of s...unknown2009-09-181-1/+1
* | | | | MergeIgor Babaev2009-11-091-8/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-8/+8
| |\ \ \ \ | | |/ / /
| | * | | Bug#32430: 'show innodb status' causes errorsMattias Jonsson2009-08-071-8/+8
* | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+27
|/ / / /
* | | | More after-merge fixes for MySQL 5.1.38 merge.unknown2009-09-151-1/+1
|/ / /
* | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+3
* | | merge 5.0-bugteam to 5.1-bugteamSatya B2009-07-241-0/+2
|\ \ \ | | |/ | |/|
| * | Fix for BUG#18828 - If InnoDB runs out of undo slots, Satya B2009-07-171-0/+2
* | | Bug#32430:'show innodb status' causes errors Invalid (old?) tableMattias Jonsson2009-06-021-0/+21
| |/ |/|
* | merged 5.0-bugteam to 5.1-bugteamGeorgi Kodinov2009-05-271-0/+3
|\ \
| * | Bug #38159: Function parsing problem generates misleading error messageGeorgi Kodinov2009-05-271-0/+3
| |/
| * Bug#28323: Server crashed in xid cache operationsDavi Arnaut2008-10-211-0/+4
* | BUG#42415 UPDATE with LIMIT clause unsafe for statement format even when ORDE...He Zhenxing2009-05-201-1/+1
* | Bug #42563: Message tells me to repair table though StorageGleb Shchepa2009-04-141-1/+1
* | Bug#41465: confusing error message when comment is too longDavi Arnaut2009-03-051-0/+8