summaryrefslogtreecommitdiff
path: root/sql/field.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-10/+12
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-10/+12
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Updated/added copyright headersKent Boortz2011-07-031-9/+11
| | | | |\ \
| | | | * \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | | |\ \ \
| | | | | * | | Updated/added copyright headersKent Boortz2011-06-301-1/+1
| | | | | * | | automergeGeorgi Kodinov2011-01-071-1/+1
| | | | | |\ \ \
| | | | | * | | | backport: Bug #55568 from 5.1-security to 5.0-securityGleb Shchepa2010-11-231-1/+1
* | | | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-271-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | bug 801466 ST_INTERSECTION() returns invalid value on empty intersection in m...Alexey Botchkov2011-09-041-1/+1
* | | | | | | | | mergeSergei Golubchik2011-11-031-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | compilation warnings on WindowsSergei Golubchik2011-11-021-9/+9
* | | | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Updated/added copyright headersKent Boortz2011-07-041-2/+4
* | | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-1627/+1128
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge of mwl #106 into 5.3. Igor Babaev2011-06-151-0/+24
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-0/+24
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ MergeIgor Babaev2011-05-201-0/+24
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-0/+24
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-0/+24
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-0/+24
| * | | | | | | | | | | | | various fixes for buildbot failuresSergei Golubchik2011-06-101-13/+4
| * | | | | | | | | | | | | small optimization in Field_time_hires.Sergei Golubchik2011-06-091-5/+8
| * | | | | | | | | | | | | bugfixes:Sergei Golubchik2011-06-091-2/+14
| * | | | | | | | | | | | | merge with 5.1-microSergei Golubchik2011-06-071-64/+175
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-57/+171
| * | | | | | | | | | | | | Fix compile errors and warnings and test errors introduced by microseconds push.Vladislav Vaintroub2011-05-281-2/+2
| * | | | | | | | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1513/+885
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |