summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* lots of post-merge changesSergei Golubchik2011-04-251-123/+11
* merge.Sergei Golubchik2010-11-251-55/+561
|\
| * Automerge with 5.2Michael Widenius2010-11-051-0/+7
| |\
| | * Automatic merge with MariaDB 5.1Michael Widenius2010-11-041-0/+7
| | |\
| | | * MBug#643463: slow XtraDB shutdown due to 10 second sleep in purge threadunknown2010-11-031-0/+7
| * | | 5.2 mergeSergei Golubchik2010-10-281-2/+6
| |\ \ \ | | |/ /
| | * | merge with 5.1Sergei Golubchik2010-10-251-2/+6
| | |\ \ | | | |/
| | | * 5.1.51 mergeSergei Golubchik2010-10-191-2/+6
| | | |\
| | | | * WL#5370 Keep forward-compatibility when changingunknown2010-08-181-2/+6
| * | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-24/+97
| |\ \ \ \ | | |/ / /
| | * | | Automatic mergeMichael Widenius2010-10-011-5/+8
| | |\ \ \
| | | * | | Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-5/+8
| | * | | | merge with 5.1Sergei Golubchik2010-09-161-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fix valgrind failure with Unique classSergey Petrunya2010-09-141-1/+1
| | * | | | rename maria to ariaSergei Golubchik2010-09-121-1/+1
| | * | | | merge with 5.1Sergei Golubchik2010-09-111-15/+49
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-14/+49
| | | |\ \ | | | | |/
| | * | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-2/+17
| | |\ \ \ | | | |/ /
| | | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-2/+17
| | | |\ \
| | * | | | Fixed bug #604503.Igor Babaev2010-07-171-0/+21
| | * | | | --plugin_maturity command-line optionSergei Golubchik2010-06-161-1/+0
| * | | | | Fix for LP bug#611625: Removing NULL references from subquery parameter list ...unknown2010-08-091-2/+2
| * | | | | Fixed a problem where the temp table of a materialized subqueryunknown2010-07-161-7/+5
| * | | | | Subquery cache (MWL#66) added.unknown2010-07-101-1/+76
| * | | | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-6/+162
| |\ \ \ \ \ | | |/ / / /
| | * | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s...Sergei Golubchik2010-06-051-0/+146
| | * | | | merge 5.1->5.2Sergei Golubchik2010-06-011-2/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-1/+5
| | | |\ \ \
| | | * \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-1/+2
| | | |\ \ \ \
| | * | | | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-3/+5
| | * | | | | | Merge with 5.1Michael Widenius2010-04-011-0/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Removed compiler warningMichael Widenius2010-03-301-0/+2
| | * | | | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-1/+2
| * | | | | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-5/+74
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mergedSergei Golubchik2010-03-151-1/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+4
| | | |\ \ \ \ \
| | * | \ \ \ \ \ merge 5.1-> 5.2unknown2009-12-081-4/+70
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-4/+69
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-4/+69
| | | | |\ \ \ \ \ \
| | | * | | | | | | | Added protection around usage of thd->mysys_varMichael Widenius2009-11-261-0/+1
| | | |/ / / / / / /
| * | | | | | | | | MWL#68 Subquery optimization: Efficient NOT IN execution with NULLsunknown2010-03-091-0/+2
| * | | | | | | | | MWL#68 Subquery optimization: Efficient NOT IN execution with NULLsunknown2010-02-191-4/+73
| * | | | | | | | | Subquery optimizations backport: fix test failures, update test results.Sergey Petrunya2010-02-181-2/+9
| * | | | | | | | | Backport of subquery optimizations to 5.3.Sergey Petrunya2010-01-171-0/+69
| * | | | | | | | | Merge MWL#67: MRR Backport and BKA backport.Sergey Petrunya2009-12-221-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Backport into MariaDB-5.2 the following:Igor Babaev2009-12-201-0/+1
| * | | | | | | | | | MWL#67: MRR backportSergey Petrunya2009-12-221-0/+1
| |/ / / / / / / / /
| * | | | | | | | | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-1/+15
| |/ / / / / / / /
| * | | | | | | | Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-0/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+2
| | |/ / / / / / /
View Lorry Controller Status