Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 3 | -6/+6 |
|\ | |||||
| * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -2/+2 |
| |\ | |||||
| | * | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED | Raghav Kapoor | 2011-09-28 | 1 | -2/+2 |
| * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 2 | -4/+4 |
| |\ \ | | |/ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 2 | -4/+4 |
| | |\ | |||||
* | | \ | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge | Kent Boortz | 2010-12-29 | 1 | -0/+16 |
| | | |\ \ | | | | |/ | |||||
| | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -0/+16 |
| | | * | | Bug#56639 Character Euro (0x88) not converted from cp1251 to utf8 | Alexander Barkov | 2010-11-26 | 1 | -1/+1 |
* | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 2 | -1/+55 |
|/ / / / | |||||
* | | | | virtual columns: | Sergei Golubchik | 2010-12-31 | 1 | -2/+4 |
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -3/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -3/+0 |
* | | | | restore shifted error numbers | Sergei Golubchik | 2010-09-12 | 1 | -8/+7 |
* | | | | Fixed bug #604549. | Igor Babaev | 2010-07-13 | 1 | -8/+11 |
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Bug #35250: readline check breaks when doing vpath build | Georgi Kodinov | 2010-03-09 | 1 | -4/+4 |
| | * | | | Bug #35250: readline check breaks when doing vpath build | Georgi Kodinov | 2010-02-12 | 1 | -4/+4 |
| | |/ / | |||||
| | * | | Bug#47974 'TYPE=storage_engine' is deprecated and will be | Magne Mahre | 2010-02-09 | 1 | -1/+1 |
* | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -0/+5 |
* | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -6/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -4/+4 |
| | * | | Automerge | Alexey Kopytov | 2009-12-13 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | Bug #42849: innodb crash with varying time_zone on partitioned | Alexey Kopytov | 2009-12-13 | 1 | -2/+2 |
* | | | | | Merge with 5.1 | Michael Widenius | 2010-01-04 | 1 | -41/+41 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Changed -1 row number in some warnings to 0 | Michael Widenius | 2009-12-06 | 1 | -39/+39 |
| * | | | | Fixed Bug#47017 rpl_timezone fails on PB-2 with mismatch error | Michael Widenius | 2009-12-04 | 1 | -2/+2 |
* | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -1/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+8 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 1 | -0/+7 |
| | * | | | Bug #42914 Log event that larger than max_allowed_packet results in stop of s... | unknown | 2009-09-18 | 1 | -1/+1 |
* | | | | | Merge | Igor Babaev | 2009-11-09 | 1 | -8/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -8/+8 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#32430: 'show innodb status' causes errors | Mattias Jonsson | 2009-08-07 | 1 | -8/+8 |
* | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+27 |
|/ / / / | |||||
* | | | | More after-merge fixes for MySQL 5.1.38 merge. | unknown | 2009-09-15 | 1 | -1/+1 |
|/ / / | |||||
* | | | Bug# 30946: mysqldump silently ignores --default-character-set | Gleb Shchepa | 2009-07-31 | 1 | -0/+3 |
* | | | merge 5.0-bugteam to 5.1-bugteam | Satya B | 2009-07-24 | 1 | -0/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix for BUG#18828 - If InnoDB runs out of undo slots, | Satya B | 2009-07-17 | 1 | -0/+2 |
* | | | Bug#32430:'show innodb status' causes errors Invalid (old?) table | Mattias Jonsson | 2009-06-02 | 1 | -0/+21 |
| |/ |/| | |||||
* | | merged 5.0-bugteam to 5.1-bugteam | Georgi Kodinov | 2009-05-27 | 1 | -0/+3 |
|\ \ | |||||
| * | | Bug #38159: Function parsing problem generates misleading error message | Georgi Kodinov | 2009-05-27 | 1 | -0/+3 |
| |/ | |||||
| * | Bug#28323: Server crashed in xid cache operations | Davi Arnaut | 2008-10-21 | 1 | -0/+4 |
* | | BUG#42415 UPDATE with LIMIT clause unsafe for statement format even when ORDE... | He Zhenxing | 2009-05-20 | 1 | -1/+1 |
* | | Bug #42563: Message tells me to repair table though Storage | Gleb Shchepa | 2009-04-14 | 1 | -1/+1 |
* | | Bug#41465: confusing error message when comment is too long | Davi Arnaut | 2009-03-05 | 1 | -0/+8 |