summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk.Alexander Nozdrin2010-04-271-14/+13
|\
| * BUG#53075 SBR: Strange warning around CONNECTION_IDAlfranio Correia2010-04-261-2/+2
| * BUG#51894 Replication failure with SBR on DROP TEMPORARY TABLE inside aAlfranio Correia2010-04-201-12/+11
| * Automerge: merged bug bundle from bug report into latestLuis Soares2010-04-161-2/+2
| |\
| | * BUG#52202: mysqlbinlog_row* fail in daily-trunk on Sol10 x86_64Luis Soares2010-03-251-2/+2
* | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-2/+14
|\ \ \ | |/ /
| * | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-2/+14
* | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-04-031-4/+1
|\ \ \ | |/ / |/| |
| * | Bug #50407 mysqlbinlog --database=X produces bad output for SAVEPOINTs2010-03-281-4/+1
* | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-183/+335
|\ \ \ | | |/ | |/|
| * | Manual merge from mysql-next-mr.Alexander Nozdrin2010-03-021-1/+13
| |\ \
| | * \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-1/+13
| | |\ \
| * | | | Bug #51336 Assert in reload_acl_and_cache during RESET QUERY CACHEJon Olav Hauglid2010-02-261-0/+1
| * | | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-241-1/+1
| |/ / /
| * | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-8/+36
| |\ \ \
| | * \ \ Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-121-4/+1
| | |\ \ \
| | | * \ \ Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with2010-02-121-4/+1
| | | |\ \ \
| | * | \ \ \ auto merge from mysql-5.1-rep+3.Luis Soares2010-02-091-5/+35
| | |\ \ \ \ \
| | | * \ \ \ \ Auto Merge from 5.1-rep+22010-01-201-38/+59
| | | |\ \ \ \ \
| | | * | | | | | BUG#49562: SBR out of sync when using numeric data types + userLuis Soares2010-01-181-1/+1
| | | * | | | | | BUG#49562: SBR out of sync when using numeric data types + userLuis Soares2010-01-151-5/+35
| | * | | | | | | Automerge from mysql-next-mr.Luis Soares2010-02-091-8/+50
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Automerge from bug branch.Luis Soares2010-01-261-3/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | BUG#50474: rpl_slave_load_remove_tmpfile failed on windows debugLuis Soares2010-01-211-3/+1
| * | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-8/+50
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-4/+35
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-271-38/+1
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-5/+53
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-61/+185
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-46/+59
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Manual merge from next-mr.2010-01-121-39/+31
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-61/+185
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-23/+126
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-8/+8
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-47/+70
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-12/+101
| | | | * | | | | | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-38/+73
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-12/+25
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-9/+22
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-9/+22
| | | * | | | | | | | | | | | | | | Merging with mysql-5.1-rpl+2Mats Kindahl2009-12-161-30/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | WL#5151: Conversion between different types whenMats Kindahl2009-12-161-30/+34
| | | * | | | | | | | | | | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-151-8/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | / / / / / / / / / | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | BUG#49618: Field length stored incorrectly in binary logMats Kindahl2009-12-151-4/+6
| | | | * | | | | | | | | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-4/+19
| | | * | | | | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-8/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-47/+69
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | / / / / / / / / / | | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-3/+3
| * | | | | | | | | | | | | | | | Fix a failure of rpl_cross_version, caused by hand-initalizationKonstantin Osipov2010-02-031-4/+4
| * | | | | | | | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-46/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |