summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-171-30/+24
|\
| * Merge to latest mysql-next-mrMikael Ronstrom2009-12-161-0/+5
| |\
| * \ MergeMikael Ronstrom2009-12-141-182/+44
| |\ \
| * \ \ Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-19/+12
| |\ \ \
| * | | | WL#5138, Fixed according to code review comments from DaviMikael Ronstrom2009-11-241-5/+3
| * | | | WL#5138, fixed review commentsMikael Ronstrom2009-11-231-8/+0
| * | | | WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-201-27/+30
| |\ \ \ \
| | * | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-121-27/+30
* | | | | | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-161-0/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-0/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-208/+375
| | |\ \ \ \
| | * \ \ \ \ Automerge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-11-261-0/+5
| | |\ \ \ \ \
| | | * \ \ \ \ auto-mergeTatiana A. Nurnberg2009-11-241-0/+5
| | | |\ \ \ \ \
| | | | * | | | | Bug#48319: Server crashes on "GRANT/REVOKE ... TO CURRENT_USER"Tatiana A. Nurnberg2009-10-291-0/+5
* | | | | | | | | Merge cleanupMarc Alff2009-12-111-1/+1
* | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-9/+43
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-173/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-25/+17
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Auto mergeHe Zhenxing2009-11-211-64/+63
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-63/+63
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioningMattias Jonsson2009-11-201-1/+0
| * | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-8/+9
| |/ / / / / / / / /
| * | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-205/+357
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | #Alexander Barkov2009-11-091-0/+34
* | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-2/+2
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-173/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-20/+27
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-174/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-174/+2
| * | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-20/+53
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Backport of:Konstantin Osipov2009-11-241-10/+10
* | | | | | | | | | Backport of:Konstantin Osipov2009-11-231-5/+0
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
View Lorry Controller Status