summaryrefslogtreecommitdiff
path: root/sql/table.cc
Commit message (Expand)AuthorAgeFilesLines
* fixes for test failuresSergei Golubchik2012-09-271-4/+4
* Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-1/+2
* Merge 5.3->5.5.Igor Babaev2012-06-241-6/+14
|\
| * Merge 5.2->5.3Igor Babaev2012-06-231-6/+14
| |\
| | * Fixed bug mdev-354.Igor Babaev2012-06-181-6/+14
* | | Fix for bug lp:944706, task MDEV-193unknown2012-05-171-1/+7
* | | 5.3 mergeSergei Golubchik2012-05-041-1/+2
|\ \ \ | |/ /
| * | LP BUG#978847 fixed.unknown2012-04-191-1/+2
* | | mergeSergei Golubchik2012-04-071-3/+21
|\ \ \ | |/ /
| * | Fix of LP bug#968720.unknown2012-04-051-3/+21
* | | Merge of compatibility fixesMichael Widenius2012-04-021-2/+1
|\ \ \ | |/ /
| * | Automatic mergeMichael Widenius2012-03-281-2/+1
| |\ \ | | |/
| | * Merge with 5.1Michael Widenius2012-03-281-2/+1
| | |\
| | | * Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-281-2/+1
* | | | Merge mariadb 5.3->mariadb 5.5unknown2012-03-241-2/+1
|\ \ \ \ | |/ / /
| * | | Speedup:Michael Widenius2012-03-231-2/+1
| * | | Backport some simple performance patches from 5.5.unknown2012-03-221-18/+23
* | | | Few simple performance fixes found with sysbench oltp.lua and Oprofile:unknown2012-03-211-18/+23
* | | | Merge 5.3->5.5Igor Babaev2012-03-171-2/+2
|\ \ \ \ | |/ / /
| * | | Merge 5.2->5.3unknown2012-03-141-2/+2
| |\ \ \ | | |/ /
| | * | Fixed LP bug #930814.Igor Babaev2012-03-091-2/+2
| | * | Fix check of view updatability in case of underlying view changes its updatab...unknown2012-02-031-0/+22
* | | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.Igor Babaev2012-03-021-23/+236
|\ \ \ \
| * | | | Addressed all review feedbacks for mwl #247.Igor Babaev2012-02-281-7/+18
| * | | | Merge.Igor Babaev2012-02-221-1/+61
| |\ \ \ \ | | |/ / /
| * | | | Fixed LP bug #921167.Igor Babaev2012-01-241-0/+2
| * | | | Fixed LP bug #914560.Igor Babaev2012-01-171-0/+2
| * | | | Fixed more compiler warnings. Igor Babaev2012-01-011-2/+4
| * | | | Fixed calculation of rec_per_key elements for added components of the extende...Igor Babaev2012-01-011-1/+1
| * | | | Merged MWL#247 into the latest 5.3.Igor Babaev2011-12-311-21/+217
| |\ \ \ \
| | * | | | Implementation of the MWL#247: Make the optimizer use extended keys.Igor Babaev2011-12-311-21/+217
* | | | | | 5.3.4 mergeSergei Golubchik2012-02-151-1/+61
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupalunknown2012-02-141-1/+32
| * | | | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.unknown2012-02-031-0/+25
| * | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-011-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Back-ported the test cases for bug #12763207 from mysql-5.6 code line into 5.2Igor Babaev2012-01-131-0/+1
| | * | | Fixed LP bug #794005.Igor Babaev2011-12-201-0/+3
* | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge with 5.1 & fixes to IGNORE handlingMichael Widenius2011-12-111-5/+7
| |\ \ \ \
| | * \ \ \ Merge with 5.2.Michael Widenius2011-12-111-5/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | Automatic mergeMichael Widenius2011-11-241-5/+7
| | | |\ \ \
| | | | * \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-5/+7
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-5/+8
| | | | | |\ \
| | | | | | * \ Updated/added copyright headersKent Boortz2011-07-031-3/+4
| | | | | | |\ \
| | | | | | * \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | | | | |\ \ \
| | | | | | | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | * | | | | | | Fix gcc 4.6 warning after merge with 5.1unknown2011-10-271-1/+1
| | | |/ / / / / /
| * | | | | | | | BUG#868908: Crash in check_simple_equality() with semijoin + materialization ...Sergey Petrunya2011-12-071-2/+2
| * | | | | | | | BUG#868908: Crash in check_simple_equality() with semijoin + materialization ...Sergey Petrunya2011-12-071-0/+2
| |/ / / / / / /
* | | | | | | | MDEV-76 5.5 memory overrun on main.select_jcl6.Sergei Golubchik2012-01-071-0/+1