Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2013-03-27 | 1 | -2/+1 |
|\ | |||||
| * | 5.2 merge | Sergei Golubchik | 2013-03-26 | 1 | -2/+1 |
| |\ | |||||
| | * | MDEV-4289 Assertion `0' fails in make_sortkey with GROUP_CONCAT, MAKE_SET, GR... | Sergei Golubchik | 2013-03-18 | 1 | -2/+1 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+5 |
| |\ \ | | |/ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -9/+12 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -8/+9 |
| | | |\ | |||||
| | | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | |\ \ | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-27 | 1 | -11/+344 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | fixed bugs | Alexey Botchkov | 2011-09-22 | 1 | -3/+3 |
| * | | | | | gis-related tests fixes. | Alexey Botchkov | 2011-06-20 | 1 | -54/+208 |
| |\ \ \ \ \ | |||||
| * | | | | | | Precise GIS functions added. | Alexey Botchkov | 2011-05-04 | 1 | -12/+345 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -55/+210 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -11/+44 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | post review changes 2 | Sergei Golubchik | 2011-05-19 | 1 | -70/+47 |
| | * | | | | | | lp:731124 Loss of precision on DISTINCT | Sergei Golubchik | 2011-03-08 | 1 | -1/+1 |
| | * | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -11/+39 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -52/+173 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
* | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -4/+4 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -9/+61 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -9/+9 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -9/+9 |
| | | |/ / | | |/| | | |||||
| * | | | | Bug#57737 Character sets: search fails with like, contraction, index | Alexander Barkov | 2010-11-26 | 1 | -0/+52 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -4/+4 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -274/+277 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -18/+8 |
| |\ \ \ | | |/ / | |||||
| * | | | Fixes after last merge of MySQL 5.1 | Michael Widenius | 2010-05-13 | 1 | -1/+4 |
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -15/+15 |
| |\ \ \ | |||||
| * | | | | Fixed random failure in test system | Michael Widenius | 2010-03-29 | 1 | -16/+16 |
| * | | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -259/+259 |
| * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+10 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -0/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -2/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed warnings and errors discovered by pushbuild2 | Michael Widenius | 2008-12-04 | 1 | -1/+1 |
* | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 1 | -18/+8 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -18/+8 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Backport of: | Konstantin Osipov | 2010-04-13 | 1 | -0/+23 |
* | | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -2/+8 |
* | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -23/+27 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Bug #8433: Overflow must be an error | Alexey Kopytov | 2010-03-18 | 1 | -3/+1 |
| * | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -19/+25 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -19/+25 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -12/+18 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | post-push fixes for BUG#39934 | Sven Sandberg | 2009-08-19 | 1 | -5/+5 |