summaryrefslogtreecommitdiff
path: root/sql/field.h
Commit message (Expand)AuthorAgeFilesLines
* 5.5-mergeSergei Golubchik2011-07-021-30/+98
|\
| * Bug#58190 BETWEEN no longer uses indexes for date or datetime fieldsAlexander Barkov2010-11-191-0/+22
| * Bug #52131: SET and ENUM stored endian-dependent in binary logMats Kindahl2010-10-061-30/+76
* | merge.Sergei Golubchik2010-11-251-19/+118
|\ \ | |/ |/|
| * Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-15/+15
| * Fixed bug #604503.Igor Babaev2010-07-171-10/+1
| * merge 5.1->5.2Sergei Golubchik2010-06-011-7/+14
| |\
| | * Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-7/+14
| | |\
| * | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-5/+11
| * | | mergedSergei Golubchik2010-03-151-1/+6
| |\ \ \ | | |/ /
| | * | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+6
| | |\ \
| * | \ \ merge 5.1->5.2unknown2010-02-011-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-0/+1
| | |\ \ \
| * | \ \ \ merge 5.1-> 5.2unknown2009-12-081-16/+23
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-16/+23
| | |\ \ \ \
| * | \ \ \ \ MergeIgor Babaev2009-11-091-0/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-0/+9
| | |\ \ \ \ \
| * | | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-6/+108
| |/ / / / / /
| * | | | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-1/+1
| |\ \ \ \ \ \
| * | | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-1/+1
| * | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-1/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-75/+138
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-0/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-0/+15
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | First part of redo/undo for key pagesunknown2007-11-141-3/+3
* | | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-5/+5
* | | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-1/+0
* | | | | | | | | | | | | Bug#52520 Difference in tinytext utf column metadataAlexander Barkov2010-06-021-1/+2
* | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+33
* | | | | | | | | | | | | | Some post-merge fixes afer a merge from mysql-5.1-bugteam.Alexey Kopytov2010-04-111-0/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-71/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Mergine from mysql-next-meAlexander Barkov2010-02-271-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-23/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-021-1/+0
| * | | | | | | | | | | | | | | | | WL#2649 Number-to-string conversionsAlexander Barkov2010-02-111-8/+34
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-23/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-151-23/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | BUG#49618: Field length stored incorrectly in binary logMats Kindahl2009-12-151-4/+4
| | | * | | | | | | | | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-23/+22
| | * | | | | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-15/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-42/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Bug #33544 UDF_INIT member decimals initialized wrong with Magne Mahre2009-11-111-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \