summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-10/+14
|\
| * Merge 5.2->5.3Sergey Petrunya2010-10-101-17/+56
| |\
| | * Automatic mergeMichael Widenius2010-10-011-1/+1
| | |\
| | | * Change some my_bool in C++ classes and a few functions to bool to detect wron...Michael Widenius2010-09-241-1/+1
| | * | merge with 5.1Sergei Golubchik2010-09-111-6/+9
| | |\ \ | | | |/ | | |/|
| | | * Fix that one can run mysql_upgrade with long table namesMichael Widenius2010-09-031-2/+2
| | | * Merge with MySQL 5.1.50Michael Widenius2010-08-271-4/+7
| | | |\
| | * | \ Merge with MariaDB 5.1.49Michael Widenius2010-08-051-12/+48
| | |\ \ \ | | | |/ /
| | | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-12/+48
| | | |\ \
| * | | \ \ 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
| | | |\ \ \
| | * | \ \ \ merge 5.1-> 5.2unknown2009-12-081-13/+15
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-13/+15
| | | |\ \ \ \
| * | | | | | | 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
| |\ \ \ \ \
| * \ \ \ \ \ Merged with mysql-5.1 tree.Michael Widenius2009-04-251-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
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed compiler warnings in a lot of filesunknown2008-02-131-2/+1
* | | | | | | | | | mysql-5.1 -> mysql-5.5 mergeSergei Golubchik2010-11-051-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug#54494 crash with explain extended and prepared statementsSergey Glukhov2010-09-231-0/+4
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | WL#5370 Keep forward-compatibility when changing unknown2010-08-181-8/+0
* | | | | | | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-041-37/+11
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-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-07-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite runDavi Arnaut2010-07-301-2/+2
* | | | | | | | | | | 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
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | 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
View Lorry Controller Status