summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-2750/+0
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-243/+500
|\
| * A post-review fix for type-aware metadata locks.Konstantin Osipov2010-03-161-9/+7
| |\
| | * A review comment for the fix for Bug#46672.Konstantin Osipov2010-03-131-4/+2
| |/
| * Fix for BUG#51215 "log-error partially works with version 5.5": WL 4738 (reen...Guilhem Bichot2010-03-051-1/+2
| * A follow-up on WL#5154 and WL#5182: remove forgotten options.Alexander Nozdrin2010-03-031-1/+1
| * Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-021-4/+26
| |\
| | * Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-011-3/+25
| | |\
| | | * Mergine from mysql-next-meAlexander Barkov2010-02-271-107/+114
| | | |\
| | | * | WL#2649 Number-to-string conversionsAlexander Barkov2010-02-111-3/+25
| | * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| * | | | merging to 6.0-codebase-bugfixing from a local branchAndrei Elkin2010-02-281-1/+2
| |\ \ \ \
| | * | | | Bug #50296 Slave reconnects earlier than the prescribed slave_net_timeout valueAndrei Elkin2010-02-281-1/+2
| * | | | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-241-17/+13
| | |/ / / | |/| | |
| * | | | merge, CMake bugfixes, remove sp-error from experimentalVladislav Vaintroub2010-02-231-2/+2
| |\ \ \ \
| * \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-211-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Patch for WL#3736: Extended Table, Column and Index Comments.Alexander Nozdrin2010-02-201-1/+2
| * | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-201-95/+104
| |\ \ \ \ \ | | |/ / / /
| | * | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-0/+1
| | |\ \ \ \
| | * | | | | Fix for bug #50908 "Assertion `handler_tables_hash.records == 0' Dmitry Lenev2010-02-121-0/+1
| | * | | | | Fix for bug #50913 "Deadlock between open_and_lock_tables_derivedDmitry Lenev2010-02-081-0/+5
| | * | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-2/+12
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-2/+3
| | |\ \ \ \ \
| | * | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-2/+2
| | * | | | | | Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-041-6/+8
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-0/+4
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-7/+10
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge next-mr -> next-4284Konstantin Osipov2010-02-031-29/+102
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-60/+135
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284. Konstantin Osipov2010-02-021-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-10/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Implement new type-of-operation-aware metadata locks.Dmitry Lenev2010-02-011-10/+5
| | * | | | | | | | | | | | | Patch that changes metadata locking subsystem to use mutex per lock andDmitry Lenev2010-01-211-4/+4
| | * | | | | | | | | | | | | Implementation of simple deadlock detection for metadata locks.Dmitry Lenev2009-12-301-1/+2
| | * | | | | | | | | | | | | Apply and review:Konstantin Osipov2009-12-291-0/+3
| | * | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-0/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-3/+0