summaryrefslogtreecommitdiff
path: root/sql/field.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | | * Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-7/+6
| | | * auto-mergeTatjana Azundris Nuernberg2011-05-121-0/+2
| | | |\
| | | * \ auto-merge Bug#11762799/Bug#55436Tatjana Azundris Nuernberg2011-05-121-3/+3
| | | |\ \
| | | | * \ auto-merge conservative fix for Bug#55436/Bug#11762799Tatiana Azundris Nurnberg2011-05-051-3/+3
| | | | |\ \
| | | | | * | Bug#55436: buffer overflow in debug binary of dbug_buff in Field_new_decimal:...Tatiana A. Nurnberg2010-11-111-3/+3
| | * | | | | 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
* | | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-0/+3
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug#11766270 59343: YEAR(4): INCORRECT RESULT AND VALGRIND WARNINGS WITH MIN/...Sergey Glukhov2011-04-121-0/+2
| | |/ / / / /
| | * | | | | Fix for bug #58650 "Failing assertion: primary_key_no == -1 ||Dmitry Lenev2011-02-021-0/+1
| | | |_|/ / | | |/| | |
* | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | MergeKent Boortz2010-12-291-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | - Added/updated copyright headersKent Boortz2010-12-281-1/+1
| | | |/ /
* | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-2/+2
* | | | | merge with 5.1Sergei Golubchik2010-10-251-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | 5.1.51 mergeSergei Golubchik2010-10-191-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Bug#55531 crash with conversions of geometry types / stringsKristofer Pettersson2010-09-071-1/+1
| | * | | Bug #55568: user variable assignments crash server when usedAlexey Kopytov2010-08-241-1/+1
| | | |/ | | |/|
* | | | Automatic mergeMichael Widenius2010-10-011-9/+8
|\ \ \ \
| * | | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-7/+7
| * | | | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable...Michael Widenius2010-09-231-2/+1
* | | | | merge with 5.1Sergei Golubchik2010-09-111-1/+7
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-1/+7
| |\ \ \ | | |/ /
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-2/+0
| | * | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-091-5/+5
| | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-1/+7
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-14/+1
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-14/+1
| |\ \ \ | | |/ /
| | * | Bug#53942 valgrind warnings with timestamp() function and incomplete datetime...Sergey Glukhov2010-05-311-14/+1
* | | | Fixed bug #607566.Igor Babaev2010-07-191-1/+1
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-40/+59
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-3/+9
| |\ \ \ | | |/ /
| | * | Fix for bug#50946: fast index creation still seems to copy the table Ramil Kalimullin2010-04-251-3/+9
| * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-37/+50
| |\ \ \ | | |/ /
| | * | Merging with mysql-5.1-bugteamMats Kindahl2010-03-171-19/+34
| | |\ \
| | | * | BUG#49618: Field length stored incorrectly in binary logMats Kindahl2010-03-171-19/+34
| | * | | Bug #49829 Many "hides virtual function" warnings withStaale Smedseng2010-03-141-12/+11
| | * | | Bug#45195 valgrind warnings about uninitialized values in store_record_in_cac...Sergey Glukhov2010-02-101-6/+5
* | | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-9/+25
* | | | | Fixed bug #539643.Igor Babaev2010-03-161-3/+1
* | | | | mergedSergei Golubchik2010-03-151-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-2/+1
| |\ \ \ \ | | |/ / /
| | * | | Bug #31145: ALTER TABLE DROP COLUMN, ADD COLUMN crashes (linux) or Georgi Kodinov2009-12-181-2/+1