summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-171-3/+53
|\
| * MergeMikael Ronstrom2009-12-141-17/+54
| |\
| * \ Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-11/+1
| |\ \
| * | | WL#5138, fixed review commentsMikael Ronstrom2009-11-231-0/+11
| * | | WL#5138, reverted some review fixesMikael Ronstrom2009-11-201-2/+2
| * | | WL#5138, review fixesMikael Ronstrom2009-11-201-2/+2
| * | | WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-201-3/+42
| |\ \ \
| | * | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-121-3/+42
* | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-2/+15
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2009-12-101-2/+4
| |\ \ \ \
| | * \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-101-1/+2
| | |\ \ \ \
| | * \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-031-4/+8
| | |\ \ \ \ \
| | * \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-10/+29
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-11/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Auto mergeHe Zhenxing2009-11-211-2/+2
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-2/+2
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | * | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-2/+2
| | |/ / / / / / /
| | * | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-29/+33
| | |\ \ \ \ \ \ \
| | * | | | | | | | #Alexander Barkov2009-11-091-0/+2
| * | | | | | | | | 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
| | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-7/+10
|/ / / / / / / /
* | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-041-1/+2
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | 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-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
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Backport of:Konstantin Osipov2009-10-161-6/+1
| | * | | | | | | | Backport of:Konstantin Osipov2009-10-141-1/+0
| | * | | | | | | | Introduce thd->query_cache_tls (threadKonstantin Osipov2009-10-131-0/+2
| | * | | | | | | | Bug #33693 general log name and location depend on PID file, Magne Mahre2009-10-121-0/+1
| | * | | | | | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-1/+1
| | |/ / / / / / /
| * | | | | | | | Fixed a few bugs in hex string generation, in call to val_str for partition e...Mikael Ronstrom2009-11-021-1/+0
| * | | | | | | | Merge to latest mysql-next-mrMikael Ronstrom2009-11-021-3/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Bug#38968 Unused mutex LOCK_bytes_sent, LOCK_bytes_receivedMarc Alff2009-10-291-2/+1
| | * | | | | | | Bug#38967 Unused mutex LOCK_AclMarc Alff2009-10-291-1/+1
| | | |_|/ / / / | | |/| | | | |
View Lorry Controller Status