summaryrefslogtreecommitdiff
path: root/sql/log.cc
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-02-161-33/+21
|\
| * Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-1/+8
| |\
| * \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-91/+86
| |\ \
| * \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-451/+653
| |\ \ \
| * | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-2/+2
| * | | | Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-041-2/+2
| |\ \ \ \
| * \ \ \ \ Merge next-mr -> next-4284Konstantin Osipov2010-02-031-195/+200
| |\ \ \ \ \
| * \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-24/+28
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-115/+341
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-2/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Patch that changes metadata locking subsystem to use mutex per lock andDmitry Lenev2010-01-211-3/+3
| * | | | | | | | | Backport of:Konstantin Osipov2009-12-081-27/+15
| * | | | | | | | | ------------------------------------------------------------Konstantin Osipov2009-12-041-4/+3
| * | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-031-17/+101
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport of:Konstantin Osipov2009-12-011-1/+1
* | | | | | | | | | | mergeVladislav Vaintroub2010-02-131-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | auto merge from mysql-5.1-rep+3.Luis Soares2010-02-091-1/+8
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Auto Merge from 5.1-rep+22010-01-201-6/+2
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | BUG#49562: SBR out of sync when using numeric data types + userLuis Soares2010-01-151-1/+8
* | | | | | | | | | | | mergeVladislav Vaintroub2010-02-061-83/+77
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-021-78/+72
| * | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Backport Bug#37148 to 5.1He Zhenxing2010-01-241-2/+2
| | * | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-7/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-201-7/+16
| * | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-251-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-181-663/+873
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-231-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Manual merge.Davi Arnaut2009-12-181-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-4/+4
* | | | | | | | | | | | | | | merge, add plugin/audit_null/CMakeLists.txtVladislav Vaintroub2010-01-261-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-191-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-191-8/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Backport from 6.0-codebase.Sergey Vojtovich2009-12-161-14/+6
| | | * | | | | | | | | | | | Backport from 6.0-codebase.Sergey Vojtovich2009-12-151-0/+9
* | | | | | | | | | | | | | | Replace another abort() under DBUG_EXECUTE_IF with DBUG_ABORT to avoid popups...Vladislav Vaintroub2010-01-221-1/+1
* | | | | | | | | | | | | | | In DBUG_EXECUTE_IF, change abort() to DBUG_ABORT() to avoid popups on windowsVladislav Vaintroub2010-01-181-8/+8
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-111-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-191/+196
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-195/+200
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Manual merge from next-mr.2010-01-121-23/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-27/+31
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | merge 5.1-rep+3 --> 5.1-rep+2-delivery1Alfranio Correia2010-01-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | BUG#50038 Deadlock on flush logs with concurrent DML and RBRAlfranio Correia2010-01-051-1/+2
* | | | | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-452/+652
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-448/+604
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /