summaryrefslogtreecommitdiff
path: root/sql/table.cc
Commit message (Expand)AuthorAgeFilesLines
* Applied all changes from Igor and SanjaMichael Widenius2013-06-151-66/+59
* Temporary commit of 10.0-mergeMichael Widenius2013-03-261-27/+28
* 10.0-base mergeSergei Golubchik2013-01-311-21/+44
|\
| * 5.5 mergeSergei Golubchik2013-01-291-16/+34
| |\
| | * Merge 5.3->5.5Igor Babaev2013-01-231-5/+9
| | |\
| | | * Merge 5.2->5.3Igor Babaev2013-01-211-5/+9
| | | |\
| | | | * Fixed bug mdev-3938.Igor Babaev2013-01-151-4/+8
| | * | | 5.3 mergeSergei Golubchik2013-01-151-11/+25
| | |\ \ \ | | | |/ /
| | | * | MDEV-3914 fix.unknown2012-12-051-11/+25
| * | | | cleanup:Sergei Golubchik2013-01-231-3/+1
| * | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-3/+3
| * | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-4/+11
* | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-1/+32
|\ \ \ \ \ | |/ / / /
| * | | | Merge 5.5-mwl248 -> 10.0-baseIgor Babaev2013-01-081-0/+10
| |\ \ \ \
| | * | | | Fixed bug mdev-3979.Igor Babaev2013-01-081-0/+10
| * | | | | Merge mwl248->10.0-base.Igor Babaev2012-12-191-1/+22
| |\ \ \ \ \
| | * \ \ \ \ Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-1/+21
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Addressed all remaining issues from the review of the patchIgor Babaev2012-12-131-1/+1
| | | * | | | Changed the names of the system tables for statistical data:Igor Babaev2012-12-051-4/+5
| | | * | | | Merge 5.5->mwl248Igor Babaev2012-12-041-11/+15
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-1/+20
| | | |\ \ \ \
| | | | * \ \ \ Merge 5.5 -> mwl248Igor Babaev2012-09-081-0/+22
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge 5.5->5.5-mwl248.Igor Babaev2012-08-291-1/+1
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-07-301-1/+8
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Performed re-factoring and re-structuring of the code for mwl#248:Igor Babaev2012-07-261-19/+11
| | | | * | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-06-261-7/+21
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Changed the type of all double columns in the system statistical tablesIgor Babaev2012-06-251-11/+11
| | | | * | | | | | | | Merge.Igor Babaev2012-05-181-1/+2
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fixed a problem for Q18 from DBT3/SF30 with innodb database instance:Igor Babaev2012-04-191-0/+1
| | | | * | | | | | | | | Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-04-111-25/+46
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | The pilot implementation of mwl#250: Use the statistics from persistentIgor Babaev2012-04-111-2/+8
| | | | * | | | | | | | | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-1/+21
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ MergeIgor Babaev2012-03-151-2/+2
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merged 5.3 changes into the mwl #248 tree.Igor Babaev2012-03-091-1/+61
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | The main patch for the MWL#248 back-ported from Igor Babaev2012-01-041-1/+19
* | | | | | | | | | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-35/+140
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-9/+0
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-11/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-221-9/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge MariaDB 5.2->5.3unknown2012-11-201-9/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Fixed bug mdev-3845.Igor Babaev2012-11-091-9/+12
| | * | | | | | | | | | | | | | Fixed bug mdev-3851.Igor Babaev2012-11-111-2/+3
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-12-131-8/+4
| * | | | | | | | | | | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-12/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-12/+117
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | merge with 5.5Sergei Golubchik2012-11-031-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 5.3 mergeSergei Golubchik2012-10-181-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Fix of MDEV-3799.unknown2012-10-101-0/+9
| | * | | | | | | | | | | MDEV-495 backport --ignore-db-dir.Alexey Botchkov2012-09-271-0/+3
* | | | | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-191-2/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /