summaryrefslogtreecommitdiff
path: root/sql/log.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * \ \ 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
* | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-181-663/+873
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | merge mysql-5.1-rep+2 --> mysql-5.1-rep+3Alfranio Correia2009-12-141-0/+48
| | | |\ \ \ \
| | | * \ \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-22/+108
| | | |\ \ \ \ \
| | | * \ \ \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-9/+5
| | | |\ \ \ \ \ \
| | | * | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-438/+603
| | | * | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-24/+81
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ 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
| | * | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merging with mysql-5.1-rep+2Mats Kindahl2009-12-151-4/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | BUG#49618: Field length stored incorrectly in binary logMats Kindahl2009-12-151-4/+1
| | * | | | | | | | | | | | WL#5142 FLUSH LOGS should take optional arguments for which log(s) to flush2009-12-031-0/+48
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Manual merge from mysql-5.1-bugteam. Re-enabled binlog.binlog_index.Alexey Kopytov2009-12-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | BUG#49638 binlog_index fails in mysql-trunk-mergeAlfranio Correia2009-12-161-6/+6
* | | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-115/+341
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | bug#49536 - deadlock on rotate_and_purge when using expire_logs_daysHe Zhenxing2009-12-151-6/+17
| * | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-109/+323
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | BUG#45292 orphan binary log created when starting server twiceAlfranio Correia2009-12-041-110/+324
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-58/+127
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | mergeKristofer Pettersson2009-11-201-2/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-2/+1