summaryrefslogtreecommitdiff
path: root/sql/handler.cc
Commit message (Expand)AuthorAgeFilesLines
* Bug#20837 Apparent change of isolation level during transactionMagne Mahre2010-06-081-3/+0
|\
| * Draft patch that fixes and a sketches test cases for:Konstantin Osipov2010-05-071-3/+0
* | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-05-311-3/+4
* | Auto-merge from mysql-trunk.Alexander Nozdrin2010-05-281-4/+8
|\ \
| * \ Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-301-4/+8
| |\ \
| | * | BUG#39053 - UNISTALL PLUGIN does not allow the storage engineSergey Vojtovich2010-04-141-4/+8
| | * | Revert of the push of bug #20837 due to failing regression tests.Georgi Kodinov2009-12-011-8/+2
| | * | Bug #20837 Apparent change of isolation level during transactionMagne Mahre2009-11-301-2/+8
* | | | Merge of bug#51851.Mattias Jonsson2010-05-241-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Bug#51851: Server with SBR locks mutex twice on LOAD DATAMattias Jonsson2010-03-301-1/+1
* | | | Clean-up, give better names, add comments toKonstantin Osipov2010-05-061-3/+22
| |/ / |/| |
* | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-04-201-1/+12
|\ \ \
| * | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+12
| |/ /
* | | Fix assorted compiler warnings.Davi Arnaut2010-03-161-1/+2
|/ /
* | mergeVladislav Vaintroub2010-02-161-72/+20
|\ \
| * \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-6/+30
| |\ \
| * \ \ Merge next-mr -> next-4284Konstantin Osipov2010-02-031-16/+22
| |\ \ \
| * \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-12/+1
| |\ \ \ \
| * | | | | Implement new type-of-operation-aware metadata locks.Dmitry Lenev2010-02-011-2/+2
| * | | | | Backport of:Konstantin Osipov2009-12-031-53/+13
| * | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-031-30/+0
| |\ \ \ \ \
| * | | | | | Backport of:Konstantin Osipov2009-12-011-9/+4
| * | | | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-8/+1
* | | | | | | In DBUG_EXECUTE_IF, change abort() to DBUG_ABORT() to avoid popups on windowsVladislav Vaintroub2010-01-181-5/+5
| |_|_|_|/ / |/| | | | |
* | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-16/+22
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | WL#2360 Performance schemaMarc Alff2010-01-061-16/+22
| | |_|/ / | |/| | |
* | | | | Manual merge from next-mr.unknown2010-01-121-12/+1
|\ \ \ \ \ | |/ / / /
| * | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-12/+1
| | |/ / | |/| |
* | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-6/+30
|\ \ \ \ | |/ / / |/| | |
| * | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-31/+2
| |\ \ \
| * \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-8/+34
| |\ \ \ \
| * | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-4/+28
| * | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-1/+29
| |\ \ \ \ \
| * \ \ \ \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-2/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-2/+2
* | | | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-30/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-1/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-30/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-30/+0
| | | |_|_|_|/ | | |/| | | |
| * | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-8/+34
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | Backport of:Konstantin Osipov2009-11-241-3/+3
* | | | | | | Backport of:Konstantin Osipov2009-11-231-12/+9
* | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-1/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null()Sergey Vojtovich2009-10-281-1/+2
| | | |/ / / / | | |/| | | |
* | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-1/+29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-1/+29
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Manual merge semi-sync to 5.1-rep+2He Zhenxing2009-10-031-0/+12
| | |\ \ \ \ \ \
| | | * | | | | | Backporting WL#4398 WL#1720He Zhenxing2009-09-261-0/+12
| | | | |_|/ / / | | | |/| | | |