summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-13/+17
|\
| * mergedSergei Golubchik2010-03-151-0/+2
| |\
| | * Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-0/+2
| | |\
| | | * BUG#47418 RBR fails, failure with mixup of base/temporary/view unknown2010-01-161-0/+2
| * | | merge 5.1-> 5.2unknown2009-12-081-13/+15
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1, with following additions:unknown2009-11-161-13/+15
| | |\ \ | | | |/
| | | * Bug #47788: Crash in TABLE_LIST::hide_view_error on Georgi Kodinov2009-10-191-0/+3
| | | * Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-13/+12
* | | | Backport of subquery optimizations to 5.3.Sergey Petrunya2010-01-171-0/+1
|/ / /
* | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-7/+8
|/ /
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-42/+51
|\ \ | |/
| * A fix for Bug#44495 "Prepared Statement: CALL p(<x>) - `thd->protocol == &thd...Konstantin Osipov2009-07-151-18/+25
| *-. Merge from 5.0-bugteamStaale Smedseng2009-06-171-8/+7
| |\ \
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-2/+2
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-2/+2
| | |/
| | * Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-1/+1
| | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-4/+4
| | |\
| | * \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-3/+4
| | |\ \
| | * \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-3/+3
| | |\ \ \
| | * \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-7/+50
| | |\ \ \ \
| | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-0/+3
| | |\ \ \ \ \
| | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-0/+3
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-0/+3
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-0/+3
| | | | | |\ \ \ \ \
| * | | | | \ \ \ \ \ Merge bug#45326Magnus Blåudd2009-06-051-22/+22
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#45326 Linker failure for libmysqld with VC++ 2008Magnus Blåudd2009-06-051-22/+22
| * | | | | | | | | | | Recommit of bug 43560 after merge with mysql-5.1-bugteamStaale Smedseng2009-05-201-0/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-4/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-5/+7
* | | | | | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-127/+555
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteamMarc Alff2008-07-141-3/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending onMarc Alff2008-07-141-3/+4
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge host.loc:/home/uchum/work/mysql-5.0unknown2008-03-271-3/+3
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Post-merge fix for Bug 35103.unknown2008-03-171-1/+1
| | * | | | | | | Bug#35103 mysql_client_test::test_bug29948 causes sporadic failuresunknown2008-03-141-6/+10
| * | | | | | | | A fix for Konstantin Osipov2008-07-031-1/+32
| * | | | | | | | Bug#31210: INSERT DELAYED crashes server when used on partitioned tablesMattias Jonsson2008-06-091-3/+3
| * | | | | | | | Bug#27430 "Crash in subquery code when in PS and table DDL changed afterunknown2008-05-201-4/+3
| * | | | | | | | Bug#27430 "Crash in subquery code when in PS and table DDL changed after unknown2008-05-201-37/+6
| * | | | | | | | Fix mysql_client_test failure in pushbuild 5.1-27430unknown2008-05-181-1/+1
| * | | | | | | | Implement some code review fixes for the fix for Bug#27430 unknown2008-05-181-46/+40
| * | | | | | | | WL#4165 "Prepared statements: validation".unknown2008-04-171-2/+86
| * | | | | | | | Fix pushbuild errors and warnings.unknown2008-04-081-6/+2
| * | | | | | | | Tentative implementation ofunknown2008-04-081-84/+432
| * | | | | | | | Merge mysql.com:/Users/davi/mysql/bugs/ps-cleanup-5.1unknown2008-03-311-33/+40
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Post-merge fixes for bug 35103unknown2008-03-251-33/+40
* | | | | | | | | | Fixed for Bug #39248 Maria: INSERT ON DUPLICATE KEY UPDATE gives error if usi...Michael Widenius2008-09-261-0/+2
* | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-12/+57
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /