summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-15/+22
|\
| * Bug#49501 Inefficient information_schema check (system collation), addonSergey Glukhov2010-01-221-3/+3
| * mergeMattias Jonsson2010-01-191-1/+1
| |\
| | * Bug#47343: InnoDB fails to clean-up after lock wait timeout onMattias Jonsson2010-01-181-1/+1
| * | Bug#49501 Inefficient information_schema check (system collation)Sergey Glukhov2010-01-191-17/+23
| * | BUG#47418 RBR fails, failure with mixup of base/temporary/view unknown2010-01-161-0/+2
| |/
* | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-151-16/+10
|\ \ | |/
| * automergeKristofer Pettersson2010-01-131-2/+4
| |\
| | * Bug#48157: crash in Item_field::used_tablesMartin Hansson2010-01-121-2/+4
| * | Bug#33982 debug assertion and crash reloading grant tables after sighup or killKristofer Pettersson2010-01-131-3/+6
| |/
| * Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLEunknown2009-12-311-11/+0
| |\
| | * Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLEunknown2009-12-311-11/+0
| | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-1/+1
* | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-208/+375
|\ \ \
| * \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-9/+9
| |\ \ \
| * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+8
| |\ \ \ \
| * \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-2/+0
| |\ \ \ \ \
| * \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-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
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-1/+22
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | 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
| | * | | | | | | | | | | A backporting patch for WL#4300 (Define privileges for tablespaces).Alexander Nozdrin2009-10-101-1/+1
| | * | | | | | | | | | | This patch is prerequisite for the 2nd milestone of WL#148 "Foreign keys"Dmitry Lenev2009-10-091-4/+4
| | * | | | | | | | | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-10/+10
| | |/ / / / / / / / / /
| * | | | | | | | | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-191-155/+278
| |/ / / / / / / / / /
| * | | | | | | | | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-171-21/+32
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-21/+26
* | | | | | | | | | | | 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
* | | | | | | | | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'.Alexander Nozdrin2009-11-051-9/+9
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |