Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -1/+2 |
|\ | |||||
| * | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -1/+2 |
| |\ | |||||
| | * | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Bug#16753869:INCORRECT TRUNCATION OF LONG SET EXPRESSION IN | Sujatha Sivakumar | 2013-06-24 | 1 | -5/+6 |
| | | * | upmerge to bug#14548159 | Rohit Kalhans | 2012-09-22 | 1 | -19/+10 |
| | | |\ | |||||
| | | | * | BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIER | Rohit Kalhans | 2012-09-22 | 1 | -18/+10 |
* | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -22/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -21/+21 |
| * | | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-4718 Test "outfile_loaddata" fails on bigendian arches (ppc64) | Sergei Golubchik | 2013-07-01 | 1 | -1/+1 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -5/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | small cleanups | Sergei Golubchik | 2013-01-15 | 1 | -2/+2 |
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+3 |
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -29/+33 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-12-13 | 1 | -4/+17 |
| * | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -29/+20 |
| |\ \ \ \ | |||||
| | * | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -29/+20 |
| | |/ / / | |||||
* | | | | | small code cleanup taken from MySQL 5.6 | Sergei Golubchik | 2012-12-16 | 1 | -4/+1 |
|/ / / / | |||||
* | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC. | Michael Widenius | 2012-10-03 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge from 5.3 | unknown | 2012-08-24 | 1 | -56/+34 |
|\ \ \ | |||||
| * \ \ | merge from 5.2 | unknown | 2012-08-24 | 1 | -55/+32 |
| |\ \ \ | |||||
| | * \ \ | Merge from 5.1. | unknown | 2012-08-24 | 1 | -55/+32 |
| | |\ \ \ | |||||
| | | * | | | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -55/+34 |
* | | | | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view. | unknown | 2012-02-03 | 1 | -1/+1 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -12/+14 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -11/+13 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -11/+13 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -9/+9 |
| | | | |\ \ | |||||
| | | | | * \ | weave merge of mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-05-10 | 1 | -6/+5 |
| | | | | |\ \ | |||||
| | | | * | \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -7/+6 |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
* | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -5/+5 |
* | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -8/+11 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Bug#12727287: Maintainer mode compilation fails with gcc 4.6 | Davi Arnaut | 2011-07-07 | 1 | -1/+3 |
| * | | | | | | | Merge from mysql-5.5.14-release | unknown | 2011-07-06 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merged mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-06-06 | 1 | -3/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | weave merge of mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-05-10 | 1 | -6/+5 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2011-05-04 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Merged 5.0-security->5.1-security | Georgi Kodinov | 2011-05-04 | 1 | -9/+9 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Bug #11764517: 57359: POSSIBLE TO CIRCUMVENT SECURE_FILE_PRIV | Georgi Kodinov | 2011-04-28 | 1 | -24/+24 |
| * | | | | | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | / / | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | |