summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* Automatic merge with 5.1Michael Widenius2010-11-251-0/+30
|\
| * Fix of LP BUG#675248.unknown2010-11-231-0/+30
* | Merge with MySQL 5.1.53Michael Widenius2010-11-251-3/+3
|\ \
| * | Bug#27606 GRANT statement should be replicated with DEFINER informationunknown2010-10-231-3/+3
* | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-1/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Bug#39932 "create table fails if column for FK is in differentMagne Mahre2010-09-011-1/+3
* | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-1/+1
* | Merge with MySQL 5.1.50Michael Widenius2010-08-271-3/+33
|\ \ | |/
| * Merge 5.1-bugteam -> 5.1-bug-42496Dmitry Shulga2010-07-231-0/+26
| |\
| | * Bug #53493 : add_to_status does not handle the longlong fields in STATUS_VARGeorgi Kodinov2010-07-141-0/+6
| | * The following statements support the CURRENT_USER() where a user is needed.unknown2010-07-041-0/+20
| * | Fixed bug #51855. Race condition in XA START. If several threadsDmitry Shulga2010-06-291-3/+7
| |/
* | Merge with MySQL 5.1.49Michael Widenius2010-08-021-4/+23
|\ \ | |/
| * Revert Bug#48321 due to build breakage and failing tests.Davi Arnaut2010-06-281-1/+0
| * The following statements support the CURRENT_USER() where a user is needed.unknown2010-06-271-0/+1
| * Bug#53189 Table map version unused and can be removedHe Zhenxing2010-05-081-2/+0
| * Bug #53088: mysqldump with -T & --default-character-set setGleb Shchepa2010-05-071-2/+23
* | 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
* | 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
| |\
* | | Fixed Bug#47017 rpl_timezone fails on PB-2 with mismatch errorMichael Widenius2009-12-041-1/+1
* | | 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
|/ / /
* | | 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
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-6/+25
View Lorry Controller Status