summaryrefslogtreecommitdiff
path: root/sql/field_conv.cc
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2015-12-291-8/+1
| | |\ \ \ | | | |/ /
| | | * | MDEV-9319 ALTER from a bigger to a smaller blob type truncates too much dataAlexander Barkov2015-12-291-8/+1
| * | | | MDEV-8605 MariaDB not use DEFAULT value even when inserted NULL for NOT NULLA...Sergei Golubchik2015-12-211-20/+31
| * | | | cleanupSergei Golubchik2015-12-211-28/+21
* | | | | Adding "const" qualifier to methods Field::eq_def() andAlexander Barkov2015-12-281-1/+1
* | | | | MDEV-9327 Split memcpy_field_possible() into virtual methods in FieldAlexander Barkov2015-12-271-36/+6
* | | | | MDEV-9326 Split field_conv_incompatible() into methodsAlexander Barkov2015-12-261-69/+32
|/ / / /
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-11/+5
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-11/+5
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-10-081-11/+5
| | |\ \ | | | |/
| | | * Bug #21143080: UPDATE ON VARCHAR AND TEXT COLUMNS PRODUCESreeharsha Ramanavarapu2015-07-161-9/+4
| | | * Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-6/+7
| | | |\
| | | | * Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2Tor Didriksen2012-04-121-5/+6
| | | |/
| | | * Merge BUG#12997905 from 5.1 to 5.5Jorgen Loland2011-11-181-1/+1
| | | |\
| | | | * Backmerge of BUG#12997905Jorgen Loland2011-11-181-1/+1
| | | * | Bug#11908153: CRASH AND/OR VALGRIND ERRORS IN FIELD_BLOB::GET_KEY_IMAGETor Didriksen2011-07-041-0/+3
| | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| | | |\ \ | | | | |/
| | | | * Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | | |\
| | | | | * Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-2/+2
| | | * | | merge of 5.1-bugteamGuilhem Bichot2010-11-221-5/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Fix for Bug#56138 "valgrind errors about overlapping memory when double-assig...Guilhem Bichot2010-11-221-5/+2
| | | * | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-1/+1
| | | * | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-1/+2
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+2
| | | * | | Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-03-291-8/+18
| | | * | | revert 48525Tatiana A. Nurnberg2010-02-221-18/+8
| | | * | | Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-02-181-8/+18
| | | |/ /
| | | | |
| | | | \
| | | *-. \ Merge from 5.0-bugteam for 43414Staale Smedseng2009-06-091-6/+6
| | | |\ \ \ | | | | | |/
| | | | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-091-4/+4
| | | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-091-4/+4
| | | | |/
| | | * | Doxygenization of comments.cmiller@zippy.cornsilk.net2007-10-111-28/+31
| | | * | Fix doxygen warnings.kostja@bodhi.(none)2007-08-161-1/+2
| | | * | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-07-131-5/+12
| | | |\ \ | | | | |/
| | | | * field_conv.cc:gshchepa/uchum@gleb.loc2007-07-121-0/+1
| | | | * Fixed bug #29360.gshchepa/uchum@gleb.loc2007-07-121-5/+11
| | | * | Merge olga.mysql.com:/home/igor/mysql-5.0-optigor@olga.mysql.com2007-06-301-1/+16
| | | |\ \ | | | | |/
| | | | * Merge olga.mysql.com:/home/igor/mysql-4.1-optigor@olga.mysql.com2007-06-301-1/+16
| | | | |\
| | | | | * Fixed bug #29251.gshchepa/uchum@gleb.loc2007-06-271-1/+16
| | | | | * Valgrind error fixesgluh@mysql.com/eagle.(none)2007-02-011-0/+4
| | | | | * a fix (bug #7589: Decimal types are ignored when updating data from another c...ramil@mysql.com2005-09-211-0/+3
| | | | * | backport of Bug#11491 Misleading error message if not NULL column set to NULL...gluh@mysql.com/eagle.(none)2007-05-301-2/+1
| | | * | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1ibabaev@bk-internal.mysql.com2007-06-011-0/+14
| | | |\ \ \
| | | | * \ \ Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my50-bug23856mhansson@dl145s.mysql.com2007-05-211-0/+14
| | | | |\ \ \ | | | | | |/ /
| | | | | * | bug#23856mhansson@dl145s.mysql.com2007-05-211-0/+14
| | | * | | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-14/+19
| | | |/ / /
| | | * | | Merge mysql.com:/home/bar/mysql-5.0.b20095bar@bar.myoffice.izhnet.ru2007-04-131-2/+30
| | | |\ \ \ | | | | |/ /
| | | | * | Bug#20095 Changing length of VARCHAR field with UTF8 collation does not trunc...bar@mysql.com2007-04-131-2/+30
| | | * | | Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-optevgen@moonbone.local2007-03-311-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the evgen@sunlight.local2007-03-301-1/+1