summaryrefslogtreecommitdiff
path: root/sql/table.h
Commit message (Expand)AuthorAgeFilesLines
* Applied all changes from Igor and SanjaMichael Widenius2013-06-151-29/+18
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-1/+5
* 5.5 mergeSergei Golubchik2013-01-291-0/+3
|\
| * Merge 5.3->5.5Igor Babaev2013-01-231-0/+3
| |\
* | \ Merged the fix for bug mdev-4019.Igor Babaev2013-01-131-0/+1
|\ \ \
| * | | Fixed bug mdev-4019.Igor Babaev2013-01-131-0/+1
* | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-8/+16
|\ \ \ \ | |/ / /
| * | | Fixed bug mdev-3979.Igor Babaev2013-01-081-8/+16
* | | | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+20
|\ \ \ \ | |/ / /
| * | | Merge 5.5->mwl248Igor Babaev2012-12-041-0/+7
| |\ \ \ | | |/ /
| * | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-0/+20
| |\ \ \
| | * \ \ Merge 5.5 -> mwl248Igor Babaev2012-09-081-0/+1
| | |\ \ \
| | * | | | Performed re-factoring and re-structuring of the code for mwl#248:Igor Babaev2012-07-261-14/+11
| | * | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-0/+2
| | |\ \ \ \
| | * \ \ \ \ Merge.Igor Babaev2012-05-181-7/+10
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-0/+9
| | |\ \ \ \ \ \
| | * | | | | | | The pilot implementation of mwl#250: Use the statistics from persistentIgor Babaev2012-04-111-0/+4
| | * | | | | | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+19
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ MergeIgor Babaev2012-03-151-1/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merged 5.3 changes into the mwl #248 tree.Igor Babaev2012-03-091-3/+36
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-0/+19
* | | | | | | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-221-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Merge MariaDB 5.2->5.3unknown2012-11-201-0/+7
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed bug mdev-3845.Igor Babaev2012-11-091-0/+7
| | | * | | | | | | | | mergeSergei Golubchik2012-04-051-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ mysql-5.1.62 mergeSergei Golubchik2012-04-051-0/+1
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Bug#13580775 ASSERTION FAILED: RECORD_LENGTH == M_RECORD_LENGTHTor Didriksen2012-01-271-0/+1
| * | | | | | | | | | | | | 5.3 mergeSergei Golubchik2012-10-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Fix of MDEV-589.unknown2012-10-051-0/+1
* | | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-35/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-35/+6
* | | | | | | | | | | | | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge 5.5-main -> 5.5-show-explainSergey Petrunya2012-07-251-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5}Sergey Petrunya2012-05-171-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | MDEV-238: SHOW EXPLAIN: Server crashes in JOIN::print_explain with FROM subqu...Sergey Petrunya2012-05-101-1/+6
* | | | | | | | | | | | | | | Automatic mergeMichael Widenius2012-09-221-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | This fix+comments was originally made by Alexey KopytovMichael Widenius2012-09-181-3/+8
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | merge 5.3->5.5unknown2012-09-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | / / / / / / / / / | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | MDEV-486 LP BUG#1010116 fix.unknown2012-09-051-0/+1
* | | | | | | | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.Igor Babaev2012-09-011-5/+40
|/ / / / / / / / / / / /
* | | | | | | | | | | | Fixed LP bug #1010729.Igor Babaev2012-06-081-0/+2
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | 5.3 mergeSergei Golubchik2012-05-041-7/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGOR...Vladislav Vaintroub2012-04-201-7/+10
| |/ / / / / / / /
* | | | | | | | | mergeSergei Golubchik2012-04-071-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix of LP bug#968720.unknown2012-04-051-0/+6
| * | | | | | | | BUG#913030: Optimizer chooses a suboptimal excution plan for Q18 from DBT-3Sergey Petrunya2012-04-021-0/+2
* | | | | | | | | Merge mariadb 5.3->mariadb 5.5unknown2012-03-241-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Improve filesort performance for small sorts: Don't write pointers to records...unknown2012-03-241-0/+1
| | |_|_|_|_|/ | |/| | | | |