summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
Commit message (Expand)AuthorAgeFilesLines
* auto-mergeGleb Shchepa2012-06-291-1/+1
|\
| * minor update to make MSVS happyGleb Shchepa2012-06-291-1/+1
* | manual merge (WL6219)Gleb Shchepa2012-06-291-1/+17
|\ \ | |/
| * Backport of the deprecation warning from WL#6219: "Deprecate and remove YEAR(...Gleb Shchepa2012-06-291-1/+17
* | Merge from mysql-5.1-security to mysql-5.5-securityJon Olav Hauglid2012-01-091-3/+9
|\ \ | |/
| * Backport from mysql-trunk of:Jon Olav Hauglid2012-01-091-3/+9
| * Merge from mysql-5.1.59-releasekaren.langford@oracle.com2011-09-151-0/+15
| |\
| | * weave merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-07-071-2/+4
| | |\
* | | | Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDSAndrei Elkin2011-12-141-5/+10
* | | | reverting the initial patch for bug#13437900 for refinement.Andrei Elkin2011-11-291-10/+6
* | | | Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDSAndrei Elkin2011-11-291-6/+10
* | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-10-121-4/+8
|\ \ \ \
| * \ \ \ merge from 5.5.16Daniel Fischer2011-09-211-0/+15
| |\ \ \ \
| * | | | | maintain behavior introduced in fix for MySQL bug 35765Tatjana Azundris Nuernberg2011-08-111-2/+6
| * | | | | manual mergeTatjana Azundris Nuernberg2011-08-081-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug#11758414/Bug#50614: Default storage_engine not honored when set from with...Tatjana Azundris Nuernberg2011-07-121-2/+2
| | | |_|/ | | |/| |
| | * | | Updated/added copyright headersKent Boortz2011-07-031-1/+4
| | |\ \ \
* | | | | | Fixed Bug#12621017 - CRASH IF A SP VARIABLE IS USED IN THE LIMIT CLAUSE OF ADmitry Shulga2011-08-131-1/+2
| |_|_|/ / |/| | | |
* | | | | Manual merge from mysql-5.5.Ramil Kalimullin2011-08-091-1/+10
|\ \ \ \ \ | |/ / / /
| * | | | Post-push fix for BUG#11809016.Alfranio Correia2011-07-241-1/+4
| * | | | BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING ...Alfranio Correia2011-07-181-0/+6
* | | | | weave merge of mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-07-071-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | Updated/added copyright headersKent Boortz2011-07-041-1/+2
| |\ \ \ \
| * \ \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \
| | | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | merge 5.1-security->5.5-securityGeorgi Kodinov2011-06-161-0/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | auto-merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-06-161-0/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fixed bug#11840395 (formerly known as bug#60347: THE STRING "VERSIONDATA"Dmitry Shulga2011-06-091-0/+15
| | |/ / | |/| |
* | | | Auto-merge of patch for bug#11764334 from mysql-5.1 tree.Dmitry Shulga2011-06-101-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Fixed bug#11764334 (formerly bug#57156): ALTER EVENT CHANGESDmitry Shulga2011-06-101-0/+3
| |/ /
* | | auto-mergeTatjana Azundris Nuernberg2011-05-121-2/+18
|\ \ \
| * | | Bug#11902767/Bug#60580: Statement improperly replicated crashes slave SQL threadTatjana Azundris Nuernberg2011-05-121-2/+18
* | | | Bug #11755431 (former 47205)Jon Olav Hauglid2011-03-081-1/+1
* | | | WL#5670: Proposal: Remove SHOW NEW MASTER statementSven Sandberg2011-02-161-13/+0
* | | | Bug#58970 Problem Subquery (without referencing a table) Magne Mahre2011-01-101-1/+2
* | | | Bug#57986 ORDER BY clause is not used after a UNION, Magne Mahre2011-01-101-2/+7
|/ / /
* | | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-4/+0
* | | BUG#57899: Certain reserved words should not be reservedLuis Soares2010-11-031-0/+4
* | | Auto-merge from mysql-5.1-bugteam for bug#36742.Dmitry Shulga2010-10-131-0/+6
|\ \ \ | |/ /
| * | Fixed bug#36742 - GRANT hostname case handling inconsistent.Dmitry Shulga2010-10-131-0/+6
* | | BUG#54144: manual merged bzr bundle from bug report.Luis Soares2010-10-081-19/+12
|\ \ \
| * | | BUG#54144: ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE is hard codedLuis Soares2010-10-071-19/+12
* | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-061-1/+1
|/ / /
* | | mergeGeorgi Kodinov2010-10-041-3/+20
|\ \ \
| * \ \ mergeMattias Jonsson2010-10-011-1/+1
| |\ \ \
| | * | | Bug#50036: Inconsistent errors when using TIMESTAMP columns/expressionsMattias Jonsson2010-08-301-1/+1
| * | | | Bug #56678 Valgrind warnings from binlog.binlog_unsafeJon Olav Hauglid2010-09-241-2/+8
| * | | | Bug #54920 Stored functions are allowed in HANDLER statements,Jon Olav Hauglid2010-09-241-0/+7
| * | | | Fix for bug #55273 "FLUSH TABLE tm WITH READ LOCK for MergeDmitry Lenev2010-09-091-0/+4