summaryrefslogtreecommitdiff
path: root/sql/records.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.3->5.5 mergeSergei Golubchik2011-11-221-13/+11
|\
| * 5.2->5.3 mergeSergei Golubchik2011-11-121-1/+1
| |\
| | * 5.1 mergeSergei Golubchik2011-11-121-1/+1
| | |\
| | | * typos fixedSergei Golubchik2011-11-081-1/+1
| * | | BUG#882472: subselect4.test fails in current 5.3Sergey Petrunya2011-10-271-10/+8
* | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \
| * \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \
| | * \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-10/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge from 5.2unknown2011-07-211-9/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge 5.1->5.2unknown2011-07-211-9/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Removed incorrect fix and its test suite (the test suit is duplicate).unknown2011-07-211-9/+0
| * | | | | | Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-1/+2
| * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-0/+9
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-0/+9
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
* | | | | | | 5.5-mergeSergei Golubchik2011-07-021-0/+9
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-11-231-0/+9
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Bug#56862 Execution of a query that uses index merge returns a wrong resultSergey Glukhov2010-11-231-0/+9
* | | | | | | lots of post-merge changesSergei Golubchik2011-04-251-3/+3
* | | | | | | merge.Sergei Golubchik2010-11-251-14/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Automatic merge with 5.1Michael Widenius2010-10-061-1/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fixed bug #56862 (lp bug #640419).Igor Babaev2010-09-191-1/+2
| * | | | | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable...Michael Widenius2010-09-231-1/+0
| * | | | | MergeIgor Babaev2010-07-171-2/+2
| |\ \ \ \ \
| | * | | | | Fixed bug #604503.Igor Babaev2010-07-171-2/+2
| | | |_|/ / | | |/| | |
| * | | | | Fix for LP#588251: doStartTableScan() result not checked.Michael Widenius2010-07-171-5/+9
| |/ / / /
| * | | | merge 5.1-> 5.2unknown2009-12-081-12/+11
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-12/+11
| | |\ \ \ | | | |/ /
| * | | | Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-0/+3
| |\ \ \ \
| | * | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+3
| | |/ / /
| * | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-6/+6
| |/ / /
| * | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+1
* | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-1/+1
* | | | Bug #30584: delete with order by and limit clauses does notGleb Shchepa2010-06-231-4/+55
* | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+5
* | | | WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"Guilhem Bichot2010-01-061-1/+2
* | | | Backport of:Konstantin Osipov2009-11-241-3/+3
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | A fix and a test case for Konstantin Osipov2009-11-031-0/+2
| |\ \ \ | | | |/ | | |/|
| | * | A fix and a test case forKonstantin Osipov2009-11-031-0/+2
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-12/+9
|\ \ \ \ | |/ / /
| * | | manual merge of 28141Tatiana A. Nurnberg2009-10-201-12/+9
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd...Tatiana A. Nurnberg2009-10-191-12/+9
* | | Backport of:Konstantin Osipov2009-10-161-0/+5
|/ /
* | Merge fix for BUG#35478 into 5.1Sergey Petrunia2008-07-151-2/+21
|\ \ | |/
| * BUG#35478: sort_union() returns bad data when sort_buffer_size is hitSergey Petrunia2008-07-151-3/+40
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-12-141-68/+61
|\ \
| * | Doxygenized comments.unknown2007-10-111-68/+61