summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+1
|\
| * MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-2/+2
* | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-1/+3
|/
* 5.5 mergeSergei Golubchik2014-05-091-0/+7
|\
| * mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-0/+7
| |\
| | * Bug #17503460 MYSQL READ ONLY DOESN'T WORK FOR DROP TRIGGERBharathy Satish2014-01-071-0/+7
* | | 10.0-base mergeSergei Golubchik2014-02-261-1/+1
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-02-251-1/+1
| |\ \ \ | | |/ /
| | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-171-1/+1
| | |\ \ | | | |/
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
* | | | 10.0-base merge (roles)Sergei Golubchik2013-10-291-58/+5
|\ \ \ \ | |/ / /
| * | | support DEFINER=role and DEFINER=current_roleSergei Golubchik2013-10-181-3/+1
| * | | cleanupSergei Golubchik2013-10-181-55/+4
* | | | 10.0-monty mergeSergei Golubchik2013-07-211-11/+42
|\ \ \ \ | |/ / / |/| | |
| * | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-11/+42
* | | | 5.5 mergeSergei Golubchik2013-07-171-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | mysql-5.5.32 mergeSergei Golubchik2013-07-161-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
* | | | MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252).Alexey Botchkov2013-04-131-1/+1
* | | | 5.5 mergeSergei Golubchik2013-03-271-3/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | extend check_global_access() to avoid my_error when it's not neededSergei Golubchik2013-03-191-3/+0
* | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-2/+2
* | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-2/+2
|/ /
* | Added new status variables:Michael Widenius2012-09-091-0/+3
* | More fixes for LOCK TABLE and REPAIR/FLUSHMichael Widenius2012-05-171-1/+1
* | Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close ...Michael Widenius2012-05-161-1/+1
* | fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo)Sergei Golubchik2012-01-171-1/+1
* | 5.3 mergeSergei Golubchik2012-01-131-2/+3
|\ \
| * \ Merge with 5.2.Michael Widenius2011-12-111-14/+141
| |\ \
| | * \ Merge with MariaDB 5.1Michael Widenius2011-11-241-14/+141
| | |\ \
| | | * \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-14/+141
| | | |\ \
| | | | * \ Updated/added copyright headersKent Boortz2011-07-031-13/+137
| | | | |\ \
| | | | * \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | | |\ \ \
| | | | | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | * | | | | | Merge with alias as StringMichael Widenius2011-02-281-5/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-5/+2
* | | | | | | | mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | compilation warnings on WindowsSergei Golubchik2011-11-021-2/+2
* | | | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+2
* | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-5/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-041-0/+1
| * | | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-0/+9
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-0/+9
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| * | | | | | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-5/+2
| |/ / / / /
* | | | | | 5.5-mergeSergei Golubchik2011-07-021-43/+165
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Manual-merge of patch for bug#11753738 from mysql-5.1 tree.Dmitry Shulga2011-06-101-10/+139
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLYDmitry Shulga2011-06-101-12/+136
| | | |/ / | | |/| |
| * | | | A patch for Bug#11763166 (55847: SHOW WARNINGS returns emptyAlexander Nozdrin2011-04-151-13/+12