summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
Commit message (Expand)AuthorAgeFilesLines
* merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-46/+59
|\
| * WL#2360 Performance schemaMarc Alff2010-01-061-46/+59
* | Manual merge from next-mr.unknown2010-01-121-39/+31
|\ \ | |/
| * Manual merge of WL#4738 from mysql-next-mr: Alexey Kopytov2009-12-281-37/+29
| |\
| | * WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-37/+29
| * | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-221-3/+3
| |/
* | 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
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Auto-merge from mysql-next-mr-summit0.3.Alexander Nozdrin2009-12-161-10/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ MergeMikael Ronstrom2009-12-141-3/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-3/+2
| |\ \ \ \ \ \ \ \
| * | | | | | | | | WL#5138, Fixed according to code review comments from DaviMikael Ronstrom2009-11-241-3/+2
| * | | | | | | | | WL#5138, fixed review commentsMikael Ronstrom2009-11-231-6/+0
| * | | | | | | | | WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-201-6/+6
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-121-6/+6
* | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-0/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #34628 LOAD DATA CONCURRENT INFILE drops CONCURRENT in binary logunknown2009-12-151-0/+4
| * | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Automerge bzr bundle in bug report into local mysql-5.1-bugteam latest.Luis Soares2009-12-071-4/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | BUG#48357: SHOW BINLOG EVENTS: Wrong offset or I/O errorLuis Soares2009-11-091-4/+4
| | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | * | | | | | | | | Automerge bzr bundle from bug report.Luis Soares2009-12-061-0/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | BUG#48340: rpl_cross_version: Found warnings/errors in server log file!Luis Soares2009-11-241-0/+1
| | | |/ / / / / / / /
| | * | | | | | | | | merge 5.1-bugteam (local) --> 5.1-bugteamAlfranio Correia2009-11-211-4/+12
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | BUG#48091 valgrind errors when slave has double not null and master has doubl...Alfranio Correia2009-10-221-6/+11
| | | * | | | | | | | BUG#48091 valgrind errors when slave has double not null and master has doubl...Alfranio Correia2009-10-221-1/+4
* | | | | | | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-6/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Backport of:Konstantin Osipov2009-11-241-4/+4
| * | | | | | | | | | Backport of:Konstantin Osipov2009-11-231-2/+1
| |/ / / / / / / / /
* | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-3/+3
|/ / / / / / / / /
* | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-15/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-15/+15
* | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Bug#46640: output from mysqlbinlog command in 5.1 breaks replicationunknown2009-10-231-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-7/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-7/+7
| | |_|/ / / / | |/| | | | |