summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* A prerequisite patch for the fix for Bug#46224Konstantin Osipov2009-12-221-0/+1
* Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-0/+2
|\
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-29/+33
| |\
| * | #Alexander Barkov2009-11-091-0/+2
* | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-0/+11
|\ \ \
| * \ \ Merge mysql-next-mr to mysql-next-mr-svoj.Sergey Vojtovich2009-12-091-0/+11
| |\ \ \
| | * | | WL#2511 - Add a new table to the Information Schema for TABLESPACE'sSergey Vojtovich2009-12-071-0/+11
* | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | WL#2360 Performance schemaMarc Alff2009-12-041-1/+2
* | | | | Backport of revno: 2617.71.1Jon Olav Hauglid2009-12-101-3/+3
* | | | | Backport of:Konstantin Osipov2009-12-091-0/+2
* | | | | Backport of:Konstantin Osipov2009-12-091-8/+9
* | | | | Backport of:Konstantin Osipov2009-12-081-3/+19
* | | | | Backport of:Konstantin Osipov2009-12-081-5/+3
* | | | | Backport of:Konstantin Osipov2009-12-081-0/+1
* | | | | Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,Konstantin Osipov2009-12-051-1/+1
* | | | | Backport of:Konstantin Osipov2009-12-031-9/+0
* | | | | Backport of:Konstantin Osipov2009-12-031-1/+1
* | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-031-14/+37
|\ \ \ \ \ | |/ / / /
| * | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-021-10/+29
| |\ \ \ \
| | * \ \ \ Manual resolving for the following filesAndrei Elkin2009-12-011-10/+29
| | |\ \ \ \
| | | * \ \ \ manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-10/+29
| | | |\ \ \ \
| | | | * | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-10/+29
| | | * | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-3/+3
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| * | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-4/+8
| |/ / / / / /
* | | | | | | Backport of:Konstantin Osipov2009-12-031-3/+0
* | | | | | | Backport of:Konstantin Osipov2009-12-021-2/+0
* | | | | | | Backport of:Konstantin Osipov2009-12-021-14/+24
* | | | | | | Backport of:Konstantin Osipov2009-12-011-2/+5
* | | | | | | Backport of:Konstantin Osipov2009-12-011-2/+2
* | | | | | | Backport of:Konstantin Osipov2009-12-011-1/+2
* | | | | | | Backport of:Konstantin Osipov2009-12-011-2/+3
* | | | | | | Backport of:Konstantin Osipov2009-12-011-1/+0
* | | | | | | Backport of:Konstantin Osipov2009-12-011-3/+3
* | | | | | | Backport of:Konstantin Osipov2009-12-011-8/+0
* | | | | | | Backport of:Konstantin Osipov2009-11-301-1/+1
* | | | | | | Backport of:Konstantin Osipov2009-11-301-10/+9
* | | | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-30/+23
|/ / / / / /
* | | | | | Backport of:Konstantin Osipov2009-11-231-11/+1
| |_|/ / / |/| | | |
* | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-11-101-2/+2
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-32/+25
|\ \ \ \ \
| * \ \ \ \ MergeMikael Ronstrom2009-11-031-28/+16
| |\ \ \ \ \ | | |/ / / /
| | * | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-3/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-95/+4
| | |\ \ \ \
| | * \ \ \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-7/+30
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge with next-mr-runtime.Konstantin Osipov2009-10-221-5/+9
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ AutomergeKristofer Pettersson2009-10-191-8/+5
| | | |\ \ \ \ \ \
| | | * | | | | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-191-5/+9
| | * | | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-15/+2
| | | |/ / / / / / | | |/| | | | | |