summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* Backport of:Konstantin Osipov2009-11-231-2/+0
* Backport of:Konstantin Osipov2009-11-231-8/+7
* Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-63/+63
|\
| * Backport of Bug#45767 to mysql-next-mrDavi Arnaut2009-11-101-48/+0
| * Backport of Bug#15192 to mysql-next-mrDavi Arnaut2009-11-101-1/+0
| * Backport of Bug#27525 to mysql-next-mrDavi Arnaut2009-11-101-12/+62
| * Backport of Bug#36649 to mysql-next-mrDavi Arnaut2009-11-101-1/+0
| * Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-11-101-1/+1
* | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-9/+9
|\ \
| * | Fix automerge: use 'thd->query()' instead of 'thd->query'.Alexander Nozdrin2009-11-051-9/+9
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+8
|\ \ \ | |/ /
| * | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-1/+8
| |\ \
| | * | BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null()Sergey Vojtovich2009-10-281-1/+8
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-2/+0
|\ \ \ \ | |/ / /
| * | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-2/+0
| |\ \ \ | | |/ /
| | * | mergeGeorgi Kodinov2009-10-161-2/+0
| | |\ \
| | | * | Bug#46019: ERROR 1356 When selecting from within anotherMartin Hansson2009-10-161-2/+0
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-17/+19
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-17/+19
| |\ \ \ | | |/ /
| | * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-17/+19
| | |/
* | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-7/+19
|\ \ \
| * | | Bug#33637 SHOW PROCEDURE CODE/SHOW FUNCTION CODE sp_name gives a syntax error.Marc Alff2009-10-291-2/+6
| * | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-2/+4
| |\ \ \
| * | | | Bug#24062 Incorrect error msg after execute DROP TABLE IF EXISTS on informati...Sergey Glukhov2009-10-231-1/+13
| * | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to BetonySergey Glukhov2009-10-231-4/+0
* | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-2/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-2/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Manual merge semi-sync to 5.1-rep+2He Zhenxing2009-10-031-0/+1
| | |\ \ \
| | | * | | Backporting WL#4398 WL#1720He Zhenxing2009-09-261-0/+1
| | * | | | BUG#23300: Slow query log on slave does not log slow replicated statementsLuis Soares2009-09-291-2/+2
| | * | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay logLuis Soares2009-09-291-0/+1
| | |/ / /
* | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-2/+27
|\ \ \ \ \ | |/ / / /
| * | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-1/+4
| |\ \ \ \
| | * | | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+4
| * | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-191-0/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug #43029: FORCE INDEX FOR ORDER BY is ignored when join Georgi Kodinov2009-10-071-0/+1
| * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-1/+22
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-1/+22
| | |\ \ \ | | | |/ /
| | | * | 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
* | | | | | Automerge from mysql-next-mr-runtime.Alexander Nozdrin2009-10-221-5/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Merge with next-mr-runtime.Konstantin Osipov2009-10-221-155/+278
| |\ \ \ \ \ \
| * | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-5/+6
* | | | | | | | Backporting patches for Bug#38347 (ALTER ROUTINE privilegeAlexander Nozdrin2009-10-221-10/+31
| |/ / / / / / |/| | | | | |
* | | | | | | AutomergeKristofer Pettersson2009-10-191-16/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Introduce thd->query_cache_tls (threadKonstantin Osipov2009-10-131-1/+1