summaryrefslogtreecommitdiff
path: root/sql/field.h
Commit message (Expand)AuthorAgeFilesLines
* Applied all changes from Igor and SanjaMichael Widenius2013-06-151-4/+44
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-15/+36
* 5.5 mergeSergei Golubchik2013-01-291-0/+1
|\
| * 5.3 mergeSergei Golubchik2013-01-281-0/+1
| |\
| | * MDEV-3875 Wrong result (missing row) on a DISTINCT query with the same subque...Sergei Golubchik2013-01-261-0/+1
* | | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+99
|\ \ \
| * | | Part 2 of the fix for bug mdev-504.Igor Babaev2012-09-081-3/+2
| * | | Performed re-factoring and re-structuring of the code for mwl#248:Igor Babaev2012-07-261-75/+8
| * | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-2/+10
| |\ \ \ | | |/ /
| * | | Changed the type of all double columns in the system statistical tablesIgor Babaev2012-06-251-7/+42
| * | | MergeIgor Babaev2012-06-011-1/+7
| |\ \ \
| * \ \ \ Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+131
| |\ \ \ \
| | * \ \ \ MergeIgor Babaev2012-03-151-39/+51
| | |\ \ \ \
| | * | | | | Fixed a compiler warning.Igor Babaev2012-01-051-1/+1
| | * | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-0/+131
* | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-12-131-0/+9
* | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-3/+69
| |_|_|_|/ / |/| | | | |
* | | | | | fix compile error, when building with oqgraphVladislav Vaintroub2012-06-251-0/+3
* | | | | | Merge 5.3->5.5.Igor Babaev2012-06-241-0/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge 5.2->5.3Igor Babaev2012-06-231-0/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fixed bug mdev-354.Igor Babaev2012-06-181-0/+4
* | | | | | mysql-5.5 mergeSergei Golubchik2012-06-141-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-2/+8
| |\ \ \ \ \
* | \ \ \ \ \ cSergei Golubchik2012-05-211-1/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2Tor Didriksen2012-04-121-1/+7
| |/ / / /
| * | | | Merge BUG#12997905 from 5.1 to 5.5Jorgen Loland2011-11-181-0/+17
| |\ \ \ \
* | \ \ \ \ Merge 5.3->5.5Igor Babaev2012-03-171-53/+51
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11"Michael Widenius2012-03-131-39/+51
| | |_|_|/ | |/| | |
* | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge with 5.2.Michael Widenius2011-12-111-3/+21
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+21
| | |\ \ \
| | | * \ \ Merge with MySQL 5.1.60Michael Widenius2011-11-231-0/+17
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Backmerge of BUG#12997905Jorgen Loland2011-11-181-0/+17
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\ \ \ | | | | |/ /
| | | | * | Updated/added copyright headersKent Boortz2011-07-031-1/+3
| | | | |\ \
* | | | | \ \ mergeSergei Golubchik2011-11-031-9/+9
|\ \ \ \ \ \ \
| * | | | | | | compilation warnings on WindowsSergei Golubchik2011-11-021-9/+9
* | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Bug#11908153: CRASH AND/OR VALGRIND ERRORS IN FIELD_BLOB::GET_KEY_IMAGETor Didriksen2011-07-041-1/+7
| * | | | | | Updated/added copyright headersKent Boortz2011-06-301-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | |\ \ \ \ \
| | | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | * | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-091-1/+1
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-389/+340
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge of mwl #106 into 5.3. Igor Babaev2011-06-151-0/+3
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-0/+3
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ MergeIgor Babaev2011-05-201-0/+3
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-0/+3
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-0/+3
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-0/+3