summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with MySQL 5.5.27Sergei Golubchik2012-08-091-27/+80
|\
| * merge from 5.5 repo.Andrei Elkin2012-07-101-5/+19
| |\
| | * merge from 5.1 to 5.5Sujatha Sivakumar2012-07-101-5/+19
| | |\
| | | * BUG#11762670:MY_B_WRITE RETURN VALUE IGNOREDSujatha Sivakumar2012-07-101-5/+19
| * | | merge bug14275000 fixes to 5.5Andrei Elkin2012-07-051-5/+13
| |\ \ \ | | |/ / | |/| |
| | * | Bug#14275000Andrei Elkin2012-07-051-4/+12
| | |/
| | * BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKETManish Kumar2012-06-121-1/+1
| | |\
| * | \ BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKETManish Kumar2012-06-121-1/+1
| |\ \ \
| | * \ \ BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKETManish Kumar2012-05-301-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKETManish Kumar2012-05-211-1/+1
| * | | | upmerge from mysql-5.1 branch -> mysql-5.5 branchRohit Kalhans2012-05-301-5/+12
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixing the build failure on Windows debug build.Rohit Kalhans2012-05-301-5/+12
| | |/ /
| * | | upmerge from mysql-5.1 branch -> mysql-5.5 branchRohit Kalhans2012-05-291-0/+6
| |\ \ \ | | |/ /
| | * | Bug#11762667: MYSQLBINLOG IGNORES ERRORS WHILE WRITING OUTPUTRohit Kalhans2012-05-291-0/+6
| | |/
| * | upmerge from mysql-5.1 -> mysql-5.5.Rohit Kalhans2012-05-181-16/+34
| |\ \ | | |/
| | * BUG#14005409 - 64624Rohit Kalhans2012-05-181-16/+34
* | | mysql-5.5 mergeSergei Golubchik2012-06-141-2/+37
|\ \ \ | |/ /
| * | Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-8/+23
| |\ \
| * \ \ merge bug11754117-45670 fixes from 5.1.Andrei Elkin2012-04-211-1/+35
| |\ \ \ | | | |/ | | |/|
| | * | BUG#11754117 incorrect logging of INSERT into auto-increment Andrei Elkin2012-04-201-1/+35
* | | | merge with 5.3.Sergei Golubchik2012-06-041-0/+1
|\ \ \ \
| * | | | MDEV-304: Insufficient buffer allocation for Query_log_eventunknown2012-06-011-0/+1
| * | | | 5.2 mergeSergei Golubchik2012-05-201-4/+21
| |\ \ \ \
| | * \ \ \ 5.1 mergeSergei Golubchik2012-05-181-4/+21
| | |\ \ \ \
| | | * \ \ \ merge with mysql-5.1.63Sergei Golubchik2012-05-171-4/+21
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
* | | | | | | cSergei Golubchik2012-05-211-7/+45
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-04-121-0/+23
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | BUG#12662190:COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM...Sujatha Sivakumar2012-04-121-0/+23
| * | | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-03-081-4/+21
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Bug#13693012: SLAVE CRASHING ON INSERT STATEMENT WITH MERGE TABLE Luis Soares2012-02-241-7/+22
* | | | | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-4/+21
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge from 5.1 to 5.5Praveenkumar Hulakund2012-02-291-4/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Bug#12601974 - STORED PROCEDURE SQL_MODE=NO_BACKSLASH_ESCAPES IGNORED AND BRE...Praveenkumar Hulakund2012-02-291-4/+21
* | | | | | Merge MWL#234: @@skip_replication feature to MariaDB 5.5.unknown2012-03-011-3/+16
|\ \ \ \ \ \
| * | | | | | MWL#234: Implement option to switch between master-side and client-side filte...unknown2011-08-161-3/+3
| * | | | | | MWL#234: After-review fixes, including better names for the new system variab...unknown2011-08-121-7/+7
| * | | | | | MWL#234: Support for marking binlog events to not be replicated, and for tell...unknown2011-08-111-3/+15
* | | | | | | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO";Michael Widenius2012-01-241-52/+28
* | | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-0/+65
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | BUG#11760927Luis Soares2011-11-151-2/+2
| * | | | | | BUG#11760927: 53375: RBR + NO PK => HIGH LOAD ON SLAVE (TABLE Luis Soares2011-11-111-0/+64
* | | | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge with 5.2.Michael Widenius2011-12-111-18/+151
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-18/+151
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-18/+151
| | | |\ \ \ | | | | | |/ | | | | |/|
* | | | | | After-merge fixes for 5.5 merge.unknown2011-12-141-3/+5
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-1/+2
* | | | | | mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \ \
| * | | | | | compilation warnings on WindowsSergei Golubchik2011-11-021-2/+2