summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-40/+80
|\
| * Merge with MySQL 5.1, with following additions:unknown2009-11-161-40/+80
| |\
| | * BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null()Sergey Vojtovich2009-10-281-1/+8
| | * mergeGeorgi Kodinov2009-10-161-2/+0
| | |\
| | | * Bug#46019: ERROR 1356 When selecting from within anotherMartin Hansson2009-10-161-2/+0
| | * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-17/+19
| | |/
| | * Bug #43029: FORCE INDEX FOR ORDER BY is ignored when join Georgi Kodinov2009-10-071-0/+1
| | * Manual merge.Davi Arnaut2009-09-301-23/+19
| | |\
| | | * Post-merge cleanup: Reorganize code for better comprehensibility.Davi Arnaut2009-09-301-24/+20
| | * | Manual merge.Davi Arnaut2009-09-301-1/+26
| | |\ \ | | | |/
| | | * Post-merge fix: DBUG macros are wrapped inside a loop.Davi Arnaut2009-09-301-1/+7
| | | * Bug#47525: MySQL crashed (Federated)Davi Arnaut2009-09-301-0/+20
| | * | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-19/+30
* | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-1/+1
|/ / /
* | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-1/+1
|\ \ \
| * \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-2/+2
| |\ \ \ | | |/ /
| | * | Merge from 5.0 for 43414Staale Smedseng2009-08-281-2/+2
| | |\ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-2/+2
| | * | reverted the fix for bug #46019 from 5.1-bugteamGeorgi Kodinov2009-08-211-2/+1
| | |\ \ | | | |/
| | * | merge of bug #46019 to 5.1-bugteamGeorgi Kodinov2009-08-201-1/+2
| | |\ \ | | | |/
* | | | Fixed compiler warning messageMichael Widenius2009-10-261-1/+5
|/ / /
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-0/+26
|\ \ \
| * | | Fix that thd->query_plan_flags was not initialised prior to executing non-que...unknown2009-09-071-0/+1
| * | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-0/+25
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-50/+79
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Bug#43587: Putting event_scheduler=1 in init SQL file crashesDavi Arnaut2009-07-241-1/+2
| |\ \
| | * | Code review for Bug#43587 Putting event_scheduler=1 in init SQL file crashes Konstantin Osipov2009-07-241-1/+2
| * | | Merge from 5.0Gleb Shchepa2009-07-241-25/+23
| |\ \ \ | | |/ / | |/| / | | |/
| | * Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-26/+23
| | * Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-161-1/+1
| * | Merge from 5.0Staale Smedseng2009-07-011-2/+2
| |\ \ | | |/
| | * Bug #45790 Potential DoS vector: Writing of user input to logStaale Smedseng2009-07-011-2/+2
| | * Merge from 5.0-btStaale Smedseng2009-06-291-2/+2
| * | Bug #45309: InnoDB does not rollback for delete and update Alexey Kopytov2009-06-231-8/+7
| | |
| | \
| *-. \ Merge from 5.0-bugteamStaale Smedseng2009-06-171-4/+4
| |\ \ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-14/+14
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-14/+14
| | |/
| | * Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-24/+79
| | |\
| | | * Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-7/+7
| | | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-23/+124
| | | |\
| | | * \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-49/+196
| | | |\ \
| | | * \ \ Merge from mysql-5.0.66-releaseJonathan Perkin2008-07-171-0/+5
| | | |\ \ \
| | | * | | | Fixed packet-test bug caused by if block that didn't have curly braces.Chad MILLER2008-07-151-0/+2
| | | * | | | Merge from 5.0 trunk.Chad MILLER2008-07-141-2/+2
| | | |\ \ \ \
| | | * \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-0/+60
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-26/+71
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-25/+78
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Push history-limiting code until after the code that adds new unknown2007-11-141-10/+34
| | * | | | | | | | | BUG#13684: SP: DROP PROCEDURE|FUNCTION IF EXISTS not binlogged ifLuis Soares2009-04-091-0/+8
| | * | | | | | | | | Auto mergeHe Zhenxing2009-04-081-2/+80
| | |\ \ \ \ \ \ \ \ \
View Lorry Controller Status