Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Merging from 5.3 | Alexander Barkov | 2013-07-08 | 1 | -2/+2 | |
|\ | ||||||
| * | MDEV-4667 DATE('string') incompability between mysql and mariadb | Sergei Golubchik | 2013-07-03 | 1 | -2/+2 | |
| * | merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 | |
| |\ | ||||||
| | * | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 | |
| | | |\ | ||||||
* | | | \ | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 1 | -6/+7 | |
| |\ \ \ \ \ | ||||||
* | \ \ \ \ \ | c | Sergei Golubchik | 2012-05-21 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2 | Tor Didriksen | 2012-04-12 | 1 | -5/+6 | |
| |/ / / / / | ||||||
| * | | | | | Merge BUG#12997905 from 5.1 to 5.5 | Jorgen Loland | 2011-11-18 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
* | | | | | | Merge 5.3->5.5. | Igor Babaev | 2012-03-01 | 1 | -0/+10 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Fixed LP bug #939009. | Igor Babaev | 2012-02-24 | 1 | -0/+10 | |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -11/+35 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | BUG#912510: Crash in do_copy_not_null with semijoin=ON, firstmatch=ON, aggreg... | Sergey Petrunya | 2012-01-08 | 1 | -1/+28 | |
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -11/+9 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+1 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | | * | | | Backmerge of BUG#12997905 | Jorgen Loland | 2011-11-18 | 1 | -1/+1 | |
| | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 | |
| | |\ \ \ \ | | | |/ / / | ||||||
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+5 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Bug#11908153: CRASH AND/OR VALGRIND ERRORS IN FIELD_BLOB::GET_KEY_IMAGE | Tor Didriksen | 2011-07-04 | 1 | -0/+3 | |
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 | |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 | |
| | | * | | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-17 | 1 | -2/+2 | |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -36/+72 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | field_conv.cc: added comments | Sergey Petrunya | 2011-08-17 | 1 | -0/+14 | |
| * | | | | | various fixes for buildbot failures | Sergei Golubchik | 2011-06-10 | 1 | -5/+3 | |
| * | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -17/+19 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -21/+38 | |
| * | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -16/+28 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | db_low_byte_first is gone | Sergei Golubchik | 2011-05-20 | 1 | -10/+5 | |
| | * | | | | | * fix for ALTER TABLE ... MODIFY timestamp->timestamp. | Sergei Golubchik | 2011-03-17 | 1 | -1/+11 | |
| | | |/ / / | | |/| | | | ||||||
| * | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -3/+5 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -3/+5 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| * | | | | | Corrected the fix for LP bug 672551. | Igor Babaev | 2010-11-12 | 1 | -9/+1 | |
| * | | | | | Fixed LP bug #672551. | Igor Babaev | 2010-11-11 | 1 | -4/+17 | |
| |/ / / / | ||||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -5/+2 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | merge of 5.1-bugteam | Guilhem Bichot | 2010-11-22 | 1 | -5/+2 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Fix for Bug#56138 "valgrind errors about overlapping memory when double-assig... | Guilhem Bichot | 2010-11-22 | 1 | -5/+2 | |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -12/+9 | |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -8/+18 | |
| |\ \ \ | | |/ / | ||||||
| * | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 | |
| * | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -14/+11 | |
* | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -1/+1 | |
* | | | | Manual merge of mysql-5.1-bugteam to | Alexey Kopytov | 2010-04-19 | 1 | -1/+2 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+2 | |
* | | | | Bug#48525: trigger changes "Column 'id' cannot be null" behaviour | Tatiana A. Nurnberg | 2010-03-29 | 1 | -8/+18 | |
* | | | | revert 48525 | Tatiana A. Nurnberg | 2010-02-22 | 1 | -18/+8 | |
* | | | | Bug#48525: trigger changes "Column 'id' cannot be null" behaviour | Tatiana A. Nurnberg | 2010-02-18 | 1 | -8/+18 | |
|/ / / | ||||||
| | | | ||||||
| \ \ | ||||||
*-. \ \ | Merge from 5.0-bugteam for 43414 | Staale Smedseng | 2009-06-09 | 1 | -6/+6 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ |