summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Patch for Bug#11765684 (58674: SP-cache does not detect changes inAlexander Nozdrin2011-03-101-0/+7
| * | | | Bug #11764779 (former 57649)Jon Olav Hauglid2011-03-071-3/+2
| * | | | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-14/+0
| * | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-09-301-0/+9
| |\ \ \ \
| * | | | | Bug #56595 RENAME TABLE causes assert on OS XJon Olav Hauglid2010-09-161-2/+4
| * | | | | Bug#27480 (Extend CREATE TEMPORARY TABLES privilegeAlexander Nozdrin2010-08-311-1/+1
* | | | | | lots of post-merge changesSergei Golubchik2011-04-251-1/+2
* | | | | | merge.Sergei Golubchik2010-11-251-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-3/+0
| * | | | Fix that one can run mysql_upgrade with long table namesMichael Widenius2010-09-031-2/+2
* | | | | Auto-merge from mysql-5.1-bugteam.Dmitry Shulga2010-09-071-0/+9
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Fixed bug #55421 - Protocol::end_statement(): Assertion `0' onDmitry Shulga2010-09-071-0/+9
| |/ /
| * | Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-3/+3
| |\ \
* | | | A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". Konstantin Osipov2010-08-091-15/+4
* | | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-271-13/+14
* | | | Merge trunk-bugfixing -> trunk-runtimeKonstantin Osipov2010-06-171-7/+6
|\ \ \ \
| * \ \ \ Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-06-111-3/+3
| |\ \ \ \
| | * \ \ \ Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-3/+3
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-211-3/+3
| * | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-101-4/+3
| |\ \ \ \ | | |/ / /
| | * | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-4/+3
| | |/ /
* | | | Fix for bug #51263 "Deadlock between transactionalDmitry Lenev2010-05-261-1/+1
* | | | Pre-requisite patch for bug #51263 "Deadlock betweenDmitry Lenev2010-05-251-3/+3
|/ / /
* | | Committing on behalf or Dmitry Lenev:Konstantin Osipov2010-04-281-0/+7
* | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-071-0/+1