summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* MWL#90: Subqueries: Inside-out execution for non-semijoin materializedSergey Petrunya2010-04-061-0/+11
* Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-58/+93
|\
| * mergedSergei Golubchik2010-03-151-6/+15
| |\
| | * Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-6/+15
| | |\
| | | * Backport Bug#37148 to 5.1He Zhenxing2010-01-241-5/+13
| | | * Auto-merged.Evgeny Potemkin2009-12-021-1/+2
| | | |\
| | | | * Bug#48508: Crash on prepared statement re-execution.Evgeny Potemkin2009-12-011-1/+2
| * | | | mergedSergei Golubchik2010-02-121-4/+13
| |\ \ \ \ | | |/ / /
| | * | | When one does a drop table, the indexes are not flushed to disk before drop a...Michael Widenius2010-02-101-4/+13
| * | | | merge 5.1->5.2unknown2010-02-011-1/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-1/+6
| | |\ \ \ | | | |/ /
| | | * | mergeKristofer Pettersson2009-11-201-1/+6
| | | |\ \
| | | | * | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-1/+6
| * | | | | Merge with 5.1Michael Widenius2010-01-041-12/+19
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed Bug#47017 rpl_timezone fails on PB-2 with mismatch errorMichael Widenius2009-12-041-12/+19
| * | | | | merge 5.1-> 5.2unknown2009-12-081-35/+40
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-34/+37
| | |\ \ \ \
| | | * \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-34/+37
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Manual Mergeunknown2009-11-031-0/+1
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | BUG#48216 Replication fails on all slaves after upgrade to 5.0.86 on masterunknown2009-11-031-0/+1
| | | | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-4/+2
| | | | * | | BUG#42829: manually merged approved bzr bundle from bug report.Luis Soares2009-11-011-1/+11
| | | | |\ \ \ | | | | | |_|/ | | | | |/| |
| | | | | * | BUG#42829: binlogging enabled for all schemas regardless ofLuis Soares2009-09-241-1/+11
| | | | * | | Bug #43029: FORCE INDEX FOR ORDER BY is ignored when join Georgi Kodinov2009-10-071-2/+4
| | | | * | | auto-mergeIngo Struewing2009-10-021-31/+17
| | | | |\ \ \
| | | | | * | | Bug #45677 Slave stops with Duplicate entry for key PRIMARY when using triggerunknown2009-10-011-31/+17
| | | | | |/ /
| | | | * | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+4
| | | | |/ /
| | * | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-1/+3
| | |/ / /
* | | | | Backport of subquery optimizations to 5.3.Sergey Petrunya2010-01-171-0/+5
|/ / / /
* | | | Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-14/+147
|\ \ \ \
| * \ \ \ MergeIgor Babaev2009-11-091-8/+11
| |\ \ \ \ | | |/ / /
| | * | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-8/+11
| | |\ \ \ | | | |/ /
| | | * | merge mysql-5.0-bugteam --> mysql-5.1-bugteamAlfranio Correia2009-08-281-8/+11
| | | |\ \ | | | | |/
| | | | * auto-merge mysql-5.0-bugteam (local) --> mysql-5.0-bugteamAlfranio Correia2009-08-281-7/+12
| | | | |\
| | | | | * BUG#46861 Auto-closing of temporary tables broken by replicate-rewrite-dbAlfranio Correia2009-08-271-7/+12
| * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-6/+136
| |/ / / /
* | | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-0/+13
|/ / / /
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-48/+70
|\ \ \ \ | |/ / /
| * | | automergeGeorgi Kodinov2009-07-161-1/+7
| |\ \ \ | | |/ /
| | * | Bug #46003 and bug #46034: backported the fixes from azalea.Georgi Kodinov2009-07-161-1/+7
| * | | Bug#45266: Uninitialized variable lead to an empty result.Evgeny Potemkin2009-06-261-0/+1
| * | | Bug#44834 strxnmov is expected to behave as you'd expectSergey Glukhov2009-06-191-3/+3
| | | |
| | \ \
| *-. \ \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-22/+21
| |\ \ \ \ | | | |/ /
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-19/+19
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-19/+19
| | |/ /
| | * | Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-15/+15
| | |\ \
| | | * \ Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-6/+6
| | | |\ \
| | | * \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-6/+35
| | | |\ \ \
| | | * \ \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-1/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-2/+6
| | | |\ \ \ \ \