summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* Backport of:Konstantin Osipov2009-11-231-12/+0
* Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+1
|\
| * Fix automerge: use 'thd->query()' instead of 'thd->query'.Alexander Nozdrin2009-11-051-1/+1
* | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+3
|\ \ | |/
| * Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+3
| |\
| | * Bug #47788: Crash in TABLE_LIST::hide_view_error on Georgi Kodinov2009-10-191-0/+3
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-15/+14
|\ \ \ | |/ /
| * | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-13/+12
| |\ \ | | |/
| | * Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-13/+12
* | | Merge with next-mr-runtime.Konstantin Osipov2009-10-221-5/+8
|\ \ \
| * \ \ AutomergeKristofer Pettersson2009-10-191-9/+9
| |\ \ \
| * | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-191-5/+8
* | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-42/+766
| |/ / / |/| | |
* | | | Backport of:Konstantin Osipov2009-10-141-8/+8
* | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-1/+1
|/ / /
* | | WL#2110 (SIGNAL)Marc Alff2009-09-101-10/+36
|/ /
* | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-18/+25
|\ \ | |/
| * A fix for Bug#44495 "Prepared Statement: CALL p(<x>) - `thd->protocol == &thd...Konstantin Osipov2009-07-151-18/+25
* | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-30/+32
|\ \ | |/
| *-. 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
| |/ / / / / / / / / /
* | | | | | | | | | | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-111-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
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Backport of DTrace patches from 6.0Mikael Ronstrom2008-12-201-0/+8
|/ / / / / / / / /
* | | | | | | | | 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