summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-02-161-58/+408
|\
| * After-merge fix.Alexander Nozdrin2010-02-151-1/+0
| * Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-1/+1
| |\
| * | Fix for bug #50908 "Assertion `handler_tables_hash.records == 0' Dmitry Lenev2010-02-121-7/+1
| * | Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-111-0/+1
| * | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-0/+16
| |\ \
| * \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-42/+107
| |\ \ \
| * | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-1/+1
| * | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-12/+6
| |\ \ \ \
| * \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-42/+21
| |\ \ \ \ \
| * \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-9/+12
| |\ \ \ \ \ \ \
| * | | | | | | | Implement new type-of-operation-aware metadata locks.Dmitry Lenev2010-02-011-7/+48
| * | | | | | | | Patch that changes metadata locking subsystem to use mutex per lock andDmitry Lenev2010-01-211-17/+45
| * | | | | | | | Implementation of simple deadlock detection for metadata locks.Dmitry Lenev2009-12-301-2/+13
| * | | | | | | | Apply and review:Konstantin Osipov2009-12-291-3/+4
| * | | | | | | | A prerequisite patch for the fix for Bug#46224Konstantin Osipov2009-12-221-9/+12
| * | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-34/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-0/+6
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport of revno: 3685Jon Olav Hauglid2009-12-101-0/+10
| * | | | | | | | | | Backport of revno: 2617.68.13Jon Olav Hauglid2009-12-091-0/+1
| * | | | | | | | | | Backport of revno: 2617.65.10Jon Olav Hauglid2009-12-081-1/+1
| * | | | | | | | | | Backport of:Konstantin Osipov2009-12-081-0/+84
| * | | | | | | | | | Backport of:Konstantin Osipov2009-12-081-10/+43
| * | | | | | | | | | Backport of:Konstantin Osipov2009-12-081-3/+16
| * | | | | | | | | | Backport of:Konstantin Osipov2009-12-041-5/+5
| * | | | | | | | | | Backport of:Konstantin Osipov2009-12-041-0/+2
| * | | | | | | | | | ------------------------------------------------------------Konstantin Osipov2009-12-041-0/+15
| * | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+47
| * | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-031-1/+0
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-4/+13
| * | | | | | | | | | | Backport of:Konstantin Osipov2009-12-021-2/+61
| * | | | | | | | | | | Backport of:Konstantin Osipov2009-12-011-38/+42
| * | | | | | | | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-2/+11
* | | | | | | | | | | | mergeVladislav Vaintroub2010-02-131-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mrLuis Soares2010-02-091-1/+0
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | mergeVladislav Vaintroub2010-02-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-281-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-201-0/+1
* | | | | | | | | | | | merge, add plugin/audit_null/CMakeLists.txtVladislav Vaintroub2010-01-261-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-191-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-191-0/+15
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | Backport from 6.0-codebase.Sergey Vojtovich2009-12-151-0/+15
| | | | |_|_|_|/ / / / | | | |/| | | | | | |
* | | | | | | | | | | mergeVladislav Vaintroub2010-01-181-43/+123
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-12/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| * | | | | | | | | | Manual merge from next-mr.unknown2010-01-121-48/+23
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-43/+127
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-44/+122
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-2/+11
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-2/+58
| | | |\ \ \ \ \ \ \ \ \ \