summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* Subquery cache (MWL#66) added.unknown2010-07-101-0/+1
* MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-24/+52
|\
| * merge 5.1->5.2Sergei Golubchik2010-06-011-5/+40
| |\
| | * Merge with MySQL 5.1.47Michael Widenius2010-05-261-2/+32
| | |\
| | | * Bug#50373 --secure-file-priv=""Kristofer Pettersson2010-05-031-2/+1
| | | * BUG#39053 - UNISTALL PLUGIN does not allow the storage engineSergey Vojtovich2010-04-141-0/+31
| | * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-2/+8
| | |\ \ | | | |/
| | | * Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-03-291-0/+4
| | | * revert 48525Tatiana A. Nurnberg2010-02-221-4/+0
| | | * Bug#48525: trigger changes "Column 'id' cannot be null" behaviourTatiana A. Nurnberg2010-02-181-0/+4
| | | * Bug#48449: hang on show create view after upgrading when view contains functi...Davi Arnaut2010-02-101-5/+2
| | | * Bug#49534: multitable IGNORE update with sql_safe_updatesMartin Hansson2010-02-101-1/+3
| * | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-0/+5
| * | | more fixes for windows and status_user.testSergei Golubchik2010-04-021-1/+1
| * | | fixes for windows buildsSergei Golubchik2010-04-021-1/+1
| * | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-14/+6
| * | | fixes for the status_user.test in ps protocolSergei Golubchik2010-03-161-5/+1
* | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-20/+112
|\ \ \ \ | |/ / /
| * | | merge 5.1->5.2unknown2010-02-011-0/+5
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.42Michael Widenius2010-01-151-0/+5
| | |\ \ | | | |/
| | | * Bug #38883 (reopened): thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-011-0/+5
| | | |\
| * | | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-061-1/+1
| * | | | Merge with 5.1Michael Widenius2010-01-041-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fixed Bug#47017 rpl_timezone fails on PB-2 with mismatch errorMichael Widenius2009-12-041-1/+1
| * | | | merge 5.1-> 5.2unknown2009-12-081-18/+105
| |\ \ \ \ | | |/ / /
| | * | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-18/+93
| | |\ \ \
| | | * \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-18/+93
| | | |\ \ \ | | | | |/ /
| | | | * | BUG#42829: manually merged approved bzr bundle from bug report.Luis Soares2009-11-011-0/+5
| | | | |\ \
| | | | | * | BUG#42829: binlogging enabled for all schemas regardless ofLuis Soares2009-09-241-0/+6
| | | | * | | mergeGeorgi Kodinov2009-10-301-2/+4
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Bug #48291 : crash with row() operator,select into @var, and Georgi Kodinov2009-10-301-2/+4
| | | | * | | A patch and a test case for Konstantin Osipov2009-10-281-0/+10
| | | | * | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-11/+33
| | | | * | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+15
| | | | * | | Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent tableSergey Glukhov2009-09-101-0/+25
| | | | | |/ | | | | |/|
| | * | | | Added protection around usage of thd->mysys_varMichael Widenius2009-11-261-0/+13
| | |/ / /
* | | | | MWL#68 Subquery optimization: Efficient NOT IN execution with NULLsunknown2010-02-191-0/+66
* | | | | Subquery optimizations backport: fix test failures, update test results.Sergey Petrunya2010-02-181-0/+1
|/ / / /
* | | | Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-0/+53
|\ \ \ \
| * | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+53
| |/ / /
* | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-5/+78
|/ / /
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-0/+2
|\ \ \
| * | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-0/+2
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-26/+128
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-0/+6
| |\ \
| | * \ Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-14/+26
| | |\ \
| | * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-0/+6
| * | | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+60
| * | | | Bug#46265: Can not disable warning about unsafe statements for binary loggingDavi Arnaut2009-07-311-1/+2
| * | | | Merge from 5.0Gleb Shchepa2009-07-241-6/+25
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|