summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-2/+5
|\
| * Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-231-2/+5
| |\
| | * Fixed bug #42496 - the server could crash on a debug assert after a failureDmitry Shulga2010-07-211-2/+5
* | | Implement WL#5502 Remove dead 5.0 class Sensitive_cursor.Konstantin Osipov2010-07-271-3/+3
* | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-271-34/+8
|/ /
* | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-281-0/+29
|\ \ | |/
| * Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.Davi Arnaut2010-06-281-0/+29
| |\
| | * Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-06-281-0/+28
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-2/+1
* | | Merge trunk-bugfixing -> trunk-runtimeKonstantin Osipov2010-06-171-13/+23
|\ \ \
| * \ \ Manual merge from mysql-5.1-bugteam.Alexey Kopytov2010-06-121-8/+14
| |\ \ \ | | |/ /
| | * | Addendum for the fix for bug #42064:Alexey Kopytov2010-06-121-7/+12
| | * | Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-6/+9
| | |\ \
| * | \ \ Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-06-111-8/+13
| |\ \ \ \
| | * \ \ \ Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-6/+9
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-211-6/+9
| * | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-101-9/+8
| |\ \ \ \ | | |/ / /
| | * | | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-9/+8
| | |/ /
* | | | Pre-requisite patch for bug #51263 "Deadlock betweenDmitry Lenev2010-05-251-1/+1
|/ / /
* | | Clean-up, give better names, add comments toKonstantin Osipov2010-05-061-1/+1
* | | Followup to Bug#42546 Backup: RESTORE fails, thinking it finds an existing tableJon Olav Hauglid2010-05-041-1/+1
* | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-071-0/+1
* | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+15
* | | A fix for Bug#49972 "Crash in prepared statements": Konstantin Osipov2010-03-111-2/+1
* | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-0/+4
|\ \ \
| * \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-01-271-0/+2
| |\ \ \ | | |/ /
| | * | BUG#47418 RBR fails, failure with mixup of base/temporary/view 2010-01-161-0/+2
* | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-2/+2
|\ \ \ \ | |/ / /
| * | | WL#2360 Performance schemaMarc Alff2010-01-061-2/+2
* | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-0/+1
|\ \ \ \ | |/ / /
| * | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-0/+1
* | | | Implement new type-of-operation-aware metadata locks.Dmitry Lenev2010-02-011-11/+16
* | | | Backport ofTor Didriksen2010-01-121-2/+2
* | | | Apply and review:Konstantin Osipov2009-12-291-40/+10
* | | | A prerequisite patch for the fix for Bug#46224Konstantin Osipov2009-12-221-8/+5
* | | | Backport of revno: 2617.71.1Jon Olav Hauglid2009-12-101-21/+15
* | | | Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,Konstantin Osipov2009-12-051-1/+24
* | | | Backport of:Konstantin Osipov2009-12-011-1/+1
* | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-1/+1
|/ / /
* | | 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
| |\ \ \ \