summaryrefslogtreecommitdiff
path: root/sql/field.cc
Commit message (Expand)AuthorAgeFilesLines
* remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-071-9/+9
* 5.5 mergeSergei Golubchik2013-03-271-5/+19
|\
| * merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-4/+4
| |\
| | * Merge from 5.1Chaithra Gopalareddy2012-12-241-4/+4
| | |\
| | | * Bug#11757005: UNION CONVERTS UNSIGNED MEDIUMINT AND BIGINTChaithra Gopalareddy2012-12-241-4/+4
| * | | MDEV-3819 missing constraints for spatial column types.Alexey Botchkov2013-02-211-1/+15
* | | | 5.5 mergeSergei Golubchik2013-01-291-0/+15
|\ \ \ \ | |/ / /
| * | | 5.3 mergeSergei Golubchik2013-01-281-0/+15
| |\ \ \
| | * | | MDEV-3875 Wrong result (missing row) on a DISTINCT query with the same subque...Sergei Golubchik2013-01-261-0/+15
* | | | | Merge mwl248->10.0-base.Igor Babaev2012-12-191-60/+98
|\ \ \ \ \
| * \ \ \ \ Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-60/+98
| |\ \ \ \ \
| | * | | | | Fixed bug mdev-3866.Igor Babaev2012-11-191-1/+3
| | * | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-59/+95
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge 5.5 -> mwl248Igor Babaev2012-09-081-1/+1
| | | |\ \ \ \
| | | * | | | | Part 2 of the fix for bug mdev-504.Igor Babaev2012-09-081-4/+3
| | | * | | | | Merge 5.5->5.5-mwl248Igor Babaev2012-08-141-0/+11
| | | |\ \ \ \ \
| | | * | | | | | Performed re-factoring and re-structuring of the code for mwl#248:Igor Babaev2012-07-261-58/+79
| | | * | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-2/+2
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ MergeIgor Babaev2012-06-011-1/+13
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-2/+1
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-2/+18
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ MergeIgor Babaev2012-03-151-13/+61
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-2/+18
* | | | | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-5/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-12-131-26/+25
* | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-83/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-83/+74
|/ / / / / / / / / / / /
* | | | | | | | | | | | Added new status variables:Michael Widenius2012-09-091-0/+3
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
* | | | | | | | | | | 5.3 mergeSergei Golubchik2012-08-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | MDEV-454 Addition of a time interval reduces the resulting valueSergei Golubchik2012-08-291-1/+1
| * | | | | | | | | 5.2 merge.Sergei Golubchik2012-08-221-0/+11
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | 5.1 mergeSergei Golubchik2012-08-221-0/+11
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ merge with MySQL 5.1.65Sergei Golubchik2012-08-221-0/+11
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
* | | | | | | | | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | auto-mergeGleb Shchepa2012-06-291-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | minor update to make MSVS happyGleb Shchepa2012-06-291-1/+1
| * | | | | | | | | manual merge (WL6219)Gleb Shchepa2012-06-291-0/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Backport of the deprecation warning from WL#6219: "Deprecate and remove YEAR(...Gleb Shchepa2012-06-291-0/+11
* | | | | | | | | | mysql-5.5 mergeSergei Golubchik2012-06-141-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-2/+14
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ cSergei Golubchik2012-05-211-1/+13
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2Tor Didriksen2012-04-121-1/+13
| |/ / / / / / /
* | | | | | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Bug#13832953 MY_STRNXFRM_UNICODE: ASSERTION `SRC' FAILED. | MY_STRNXFRM_UNIC...Alexander Barkov2012-03-201-2/+1
* | | | | | | Merge 5.3->5.5Igor Babaev2012-03-171-14/+60
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11"Michael Widenius2012-03-131-13/+61
| | |_|_|_|/ | |/| | | |
* | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Backport from trunk of:Tor Didriksen2011-08-191-1/+2
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge with 5.2.Michael Widenius2011-12-111-11/+13
| |\ \ \ \ \ | | | |_|/ / | | |/| | |