summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL 5.1.42 and XtraDB 9 into MariaDB trunk, after fixing test failures.unknown2010-01-171-100/+197
|\
| * Merge with MySQL 5.1.42Michael Widenius2010-01-151-100/+197
| |\
| | * Automerge.Davi Arnaut2009-11-251-12/+33
| | |\
| | | * mergeKristofer Pettersson2009-11-201-12/+25
| | | |\
| | | | * Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-12/+25
| | | * | BUG#47995: Mark system functions as unsafeSven Sandberg2009-11-181-0/+8
| | * | | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crashDavi Arnaut2009-11-121-88/+164
| | |/ /
* | | | Fixed that we use same flags when testing for assembler as by makefiles.Michael Widenius2010-01-151-18/+5
|/ / /
* | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-13/+12
|\ \ \ | |/ /
| * | mergeGeorgi Kodinov2009-10-301-2/+1
| |\ \
| | * | Bug #48293: crash with procedure analyse, view with > 10 columns,Georgi Kodinov2009-10-301-2/+1
| | * | Bug#34895 'show procedure status' or 'show function status' +Kristofer Pettersson2009-09-301-4/+0
| | * | Bug#42108 Wrong locking for UPDATE with subqueries leads to broken statementKristofer Pettersson2009-09-291-1/+1
| * | | Revert the fix for bug #47627 as it's causing the regression tests in pb2 toGeorgi Kodinov2009-10-231-47/+14
| | |/ | |/|
| * | automergeKristofer Pettersson2009-10-201-14/+47
| |\ \
| | * | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crashKristofer Pettersson2009-10-191-14/+47
| * | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-1/+1
| |/ /
| * | Bug#43746: YACC return wrong query string when parse 'load data infile' sql s...Tatiana A. Nurnberg2009-09-281-9/+3
| * | Bug#46259: 5.0.83 -> 5.1.36, query doesn't workMartin Hansson2009-09-071-1/+7
* | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-6/+8
|\ \ \ | |/ /
| * | Bug #44331 Restore of database with events produces warning in replicationunknown2009-08-291-3/+4
| * | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-08-271-1/+2
| |\ \ | | |/
| | * Bug#46184 Crash, SELECT ... FROM derived table procedure analyzeSergey Glukhov2009-08-271-1/+2
| | * Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-161-11/+12
| * | mergeMattias Jonsson2009-08-121-8/+0
| |\ \
| | * | A follow up patch for Bug#45829 "CREATE TABLE TRANSACTIONAL Konstantin Osipov2009-08-121-8/+0
| * | | mergeMattias Jonsson2009-08-121-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Bug#39893: Crash if select on a partitioned table, when partitioning is disabledMattias Jonsson2009-01-081-2/+2
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-89/+133
|\ \ \ \ | |/ / /
| * | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+2
| * | | Bug#46354, when defining partitions without subpartition definition after def...Mikael Ronstrom2009-07-291-0/+21
| * | | Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted,...Guilhem Bichot2009-07-291-15/+0
| * | | automergeGeorgi Kodinov2009-07-161-0/+6
| |\ \ \ | | | |/ | | |/|
| | * | Bug #45287: phase 1 : 32 bit compilation warningsGeorgi Kodinov2009-07-151-0/+6
| * | | Bug #41156: List of derived tables acts like a chain ofGleb Shchepa2009-07-111-0/+5
| | | |
| | \ \
| *-. \ \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-3/+3
| |\ \ \ \ | | | |/ /
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-3/+3
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-3/+3
| | |/ /
| * | | Manual merge.Alexey Kopytov2009-06-011-5/+6
| |\ \ \ | | |/ /
| | * | Bug #44767: invalid memory reads in password() and Alexey Kopytov2009-05-271-5/+6
| | * | Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-0/+94
| | |\ \
| | | * \ Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-0/+5
| | | |\ \
| | | * \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-371/+1469
| | | |\ \ \
| | | * \ \ \ Merge from mysql-5.0.66-releaseJonathan Perkin2008-07-171-45/+48
| | | |\ \ \ \
| | | * \ \ \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-27/+26
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-11/+32
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-67/+118
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-0/+94
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ mergingAlexey Botchkov2009-04-291-82/+87
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | mergingAlexey Botchkov2009-04-281-82/+90
| | |\ \ \ \ \ \ \ \ \ \