Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MySQL 5.5.20 into MariaDB 5.5. | unknown | 2012-02-14 | 1 | -0/+3 |
|\ | |||||
| * | merged bug#12361113. | Mattias Jonsson | 2011-12-14 | 1 | -0/+3 |
| |\ | |||||
| | * | merge | Mattias Jonsson | 2011-12-14 | 1 | -0/+3 |
* | | | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO"; | Michael Widenius | 2012-01-24 | 1 | -2/+11 |
* | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 2 | -4/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge of patch for bug#11756764 from mysql-5.1. | Nirbhay Choubey | 2011-11-29 | 2 | -4/+10 |
| |\ \ | | |/ | |||||
| | * | Bug#11756764 48726: MYSQLD KEEPS CRASHING WITH SIGSEGV | Nirbhay Choubey | 2011-11-29 | 2 | -4/+10 |
| * | | Merge. | Sergey Vojtovich | 2011-10-21 | 2 | -5/+16 |
| |\ \ | | |/ | |||||
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 31 | -36/+65 |
|\ \ \ | |||||
| * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 40 | -92/+187 |
| |\ \ \ | |||||
| | * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 40 | -109/+188 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 6 | -10/+21 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | BUG#11757032 - 49030: OPTIMIZE TABLE BREAKS MYISAM TABLE WHEN | Sergey Vojtovich | 2011-10-20 | 2 | -5/+16 |
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 40 | -82/+166 |
| | | |\ \ \ | |||||
| * | | | | | | bug 857066 Wrong result with ST_DISJOINT when using an index. | Alexey Botchkov | 2011-11-29 | 1 | -1/+1 |
* | | | | | | | compiler warnings/errors | Sergei Golubchik | 2011-11-23 | 1 | -2/+2 |
* | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 6 | -37/+72 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | 5.2->5.3 merge | Sergei Golubchik | 2011-11-12 | 1 | -14/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes). | unknown | 2011-10-27 | 1 | -17/+1 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / / | |||||
| | | * | | | | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -17/+1 |
| * | | | | | | Merge. | Igor Babaev | 2011-11-06 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fixed lp:884101 "Crash in check_table_is_closed with concurrent workload" | Michael Widenius | 2011-11-04 | 1 | -0/+3 |
| * | | | | | | | Backported the fix and the test case for bug #58816 from mysql-5.6 code line. | Igor Babaev | 2011-10-29 | 1 | -3/+0 |
| |/ / / / / / | |||||
| * | | | | | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys... | Michael Widenius | 2011-10-26 | 2 | -2/+8 |
| * | | | | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -3/+0 |
| * | | | | | | merge | Sergei Golubchik | 2011-10-11 | 2 | -10/+9 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 2 | -10/+9 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | support for plugins on windows | Sergei Golubchik | 2011-10-04 | 1 | -9/+9 |
| | | * | | | | remove redundant declarations | Sergei Golubchik | 2011-10-04 | 1 | -1/+0 |
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-09-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Reset variable to not access it uninitialized | Michael Widenius | 2011-09-14 | 1 | -0/+1 |
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 3 | -8/+31 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 3 | -8/+31 |
| * | | | | | | Merge 5.2->5.3 | unknown | 2011-09-02 | 3 | -11/+35 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fixed non critical buffer overflow bug in open_binary_frm() that could cause ... | Michael Widenius | 2011-09-01 | 3 | -10/+28 |
| | * | | | | | Added logging of all messages (also system warnings) one gets during a MyISAM... | Michael Widenius | 2011-08-29 | 1 | -3/+9 |
* | | | | | | | few cmake/compiler warnings | Sergei Golubchik | 2011-11-03 | 1 | -3/+2 |
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 56 | -117/+139 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | merge from 5.5.16 | Daniel Fischer | 2011-09-21 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| * | | | | | | | Merge. | Sergey Vojtovich | 2011-09-16 | 4 | -5/+5 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | BUG#11761180 - 53646: MYISAMPACK CORRUPTS TABLES WITH | Sergey Vojtovich | 2011-09-16 | 4 | -5/+5 |
| | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+1 |
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 10 | -28/+122 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 9 | -9/+18 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 56 | -111/+123 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 38 | -75/+160 |
* | | | | | | | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -3/+1 |
* | | | | | | | cleanups | Sergei Golubchik | 2011-10-19 | 1 | -2/+0 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 21 | -164/+390 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | |